From 36993f5b749d3c177218f74eaab15b17fb066463 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 10 Jan 2020 07:33:38 +0200 Subject: [PATCH] Fix unit name for memory request for weave --- .../addons/networking.weave/k8s-1.12.yaml.template | 8 ++++---- .../addons/networking.weave/k8s-1.6.yaml.template | 8 ++++---- .../addons/networking.weave/k8s-1.7.yaml.template | 8 ++++---- .../addons/networking.weave/k8s-1.8.yaml.template | 8 ++++---- .../addons/networking.weave/pre-k8s-1.6.yaml.template | 4 ++-- 5 files changed, 18 insertions(+), 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 index e00ef788c549e..916ba8033fee6 100644 --- 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 index 0158c84251ca7..2b7d79831ec1b 100644 --- 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 index b55341ffa4450..c4401df9756de 100644 --- 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 index cd83d8d026f54..ea35b237abc8b 100644 --- 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 index fa09623a54442..453b6c106bc3c 100644 --- 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: