Merge pull request #8303 from hakman/fix-weave-mem

Fix unit name for memory request for weave
kubernetes · Jan 10, 2020 · cf79ab9 · cf79ab9
2 parents 1b8b074 + 36993f5
commit cf79ab9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
@@ -180,12 +180,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.CPURequest "50m" }}
-              memory: {{ or .Networking.Weave.MemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.CPULimit }}
               cpu: {{ .Networking.Weave.CPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.MemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts:
@@ -218,12 +218,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.NPCCPURequest "50m" }}
-              memory: {{ or .Networking.Weave.NPCMemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.NPCCPULimit }}
               cpu: {{ .Networking.Weave.NPCCPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.NPCMemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template
@@ -162,12 +162,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.CPURequest "50m" }}
-              memory: {{ or .Networking.Weave.MemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.CPULimit }}
               cpu: {{ .Networking.Weave.CPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.MemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts:
@@ -199,12 +199,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.NPCCPURequest "50m" }}
-              memory: {{ or .Networking.Weave.NPCMemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.NPCCPULimit }}
               cpu: {{ .Networking.Weave.NPCCPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.NPCMemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryLimit "200Mi" }}
           securityContext:
             privileged: true
       hostNetwork: true

diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template
@@ -172,12 +172,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.CPURequest "50m" }}
-              memory: {{ or .Networking.Weave.MemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.CPULimit }}
               cpu: {{ .Networking.Weave.CPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.MemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts:
@@ -210,12 +210,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.NPCCPURequest "50m" }}
-              memory: {{ or .Networking.Weave.NPCMemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.NPCCPULimit }}
               cpu: {{ .Networking.Weave.NPCCPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.NPCMemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
@@ -176,12 +176,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.CPURequest "50m" }}
-              memory: {{ or .Networking.Weave.MemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.CPULimit }}
               cpu: {{ .Networking.Weave.CPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.MemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts:
@@ -214,12 +214,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.NPCCPURequest "50m" }}
-              memory: {{ or .Networking.Weave.NPCMemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.NPCCPULimit }}
               cpu: {{ .Networking.Weave.NPCCPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.NPCMemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.NPCMemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template
@@ -60,12 +60,12 @@ spec:
           resources:
             requests:
               cpu: {{ or .Networking.Weave.CPURequest "50m" }}
-              memory: {{ or .Networking.Weave.MemoryRequest "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryRequest "200Mi" }}
             limits:
               {{- if .Networking.Weave.CPULimit }}
               cpu: {{ .Networking.Weave.CPULimit }}
               {{- end }}
-              memory: {{ or .Networking.Weave.MemoryLimit "200mi" }}
+              memory: {{ or .Networking.Weave.MemoryLimit "200Mi" }}
           securityContext:
             privileged: true
           volumeMounts: