Update templates and values file to match #3161

Signed-off-by: Ivan Sim <ivan@buoyant.io>
linkerd · Jul 30, 2019 · ae65005 · ae65005
1 parent 70c1a61
commit ae65005
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/charts/linkerd/templates/_config.tpl b/charts/linkerd/templates/_config.tpl
@@ -47,10 +47,10 @@
   "proxyUid": {{.Proxy.UID}},
   "proxyVersion": "{{.Proxy.Image.Version}}",
   "resource":{
-    "limitCpu": "{{.Proxy.ResourceRequirements.CPU.Limit}}",
-    "limitMemory": "{{.Proxy.ResourceRequirements.Memory.Limit}}",
-    "requestCpu": "{{.Proxy.ResourceRequirements.CPU.Request}}",
-    "requestMemory": "{{.Proxy.ResourceRequirements.Memory.Request}}"
+    "limitCpu": "{{.Proxy.Resources.CPU.Limit}}",
+    "limitMemory": "{{.Proxy.Resources.Memory.Limit}}",
+    "requestCpu": "{{.Proxy.Resources.CPU.Request}}",
+    "requestMemory": "{{.Proxy.Resources.Memory.Request}}"
   }
 }
 {{- end -}}

diff --git a/charts/linkerd/values.yaml b/charts/linkerd/values.yaml
@@ -87,6 +87,8 @@ Proxy:
   Capabilities:
     Add:
     Drop:
+  DisableIdentity: false # inject-only options. Do not change during installation
+  DisableTap: false # inject-only option. Do not change during installation
   EnableExternalProfile: false
   Image:
     Name: gcr.io/linkerd-io/proxy
@@ -99,36 +101,30 @@ Proxy:
     Control: 4190
     Inbound: 4143
     Outbound: 4140
-  UID: 2102
-
-  # use this to override the default resource requirements in HA mode
-  ResourceRequirements:
+  Resources:
     CPU:
       Limit: "1"
       Request: 100m
     Memory:
       Limit: 250Mi
       Request: 20Mi
-
-  # inject-only options. Do not change this for control plane installation
-  DisableIdentity: false
-  DisableTap: false
+  UID: 2102
 
 # proxy-init configuration
 ProxyInit:
   Capabilities:
     Add:
     Drop:
+  IgnoreInboundPorts: ""
+  IgnoreOutboundPorts: "443"
   Image:
     Name: gcr.io/linkerd-io/proxy-init
     PullPolicy: *image_pull_policy
     Version: v1.0.0
-  IgnoreInboundPorts: ""
-  IgnoreOutboundPorts: "443"
   MountPath:
 
   # use this to override the default resource requirements in HA mode
-  ResourceRequirements:
+  Resources:
     CPU:
       Limit: 100m
       Request: 10m

diff --git a/charts/partials/templates/_proxy-init.tpl b/charts/partials/templates/_proxy-init.tpl
@@ -7,13 +7,13 @@
   - --proxy-uid
   - {{.Proxy.UID | quote}}
   - --inbound-ports-to-ignore
-  - {{.Proxy.Port.Control}},{{.Proxy.Port.Admin}}{{ternary (printf ",%s" .ProxyInit.IgnoreInboundPorts) "" (ne .ProxyInit.IgnoreInboundPorts "")}}
+  - {{.Proxy.Port.Control}},{{.Proxy.Port.Admin}}{{ternary (printf ",%s" .ProxyInit.IgnoreInboundPorts) "" (not (empty .ProxyInit.IgnoreInboundPorts))}}
   - --outbound-ports-to-ignore
   - {{.ProxyInit.IgnoreOutboundPorts | quote}}
   image: {{.ProxyInit.Image.Name}}:{{.ProxyInit.Image.Version}}
   imagePullPolicy: {{.ProxyInit.Image.PullPolicy}}
   name: linkerd-init
-  {{- include "partials.resources" .ProxyInit.ResourceRequirements | nindent 2 }}
+  {{- include "partials.resources" .ProxyInit.Resources | nindent 2 }}
   securityContext:
     allowPrivilegeEscalation: false
     capabilities:

diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl
@@ -29,7 +29,7 @@
   - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY
     value: "10000"
   {{ end -}}
-  {{ if .DisableIdentity -}}
+  {{ if .Proxy.DisableIdentity -}}
   - name: LINKERD2_PROXY_IDENTITY_DISABLED
     value: disabled
   {{ else -}}
@@ -84,7 +84,7 @@
       port: {{.Proxy.Port.Admin}}
     initialDelaySeconds: 2
   {{- if eq .HighAvailability true -}}
-  {{- include "partials.resources" .Proxy.ResourceRequirements | nindent 2 -}}
+  {{- include "partials.resources" .Proxy.Resources | nindent 2 -}}
   {{- end }}
   securityContext:
     allowPrivilegeEscalation: false