Remove duplicated resources partial template

Signed-off-by: ihcsim <ihcsim@gmail.com>
linkerd · Jul 26, 2019 · 430a5d5 · 430a5d5
1 parent 824ccf9
commit 430a5d5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 30 deletions.
diff --git a/charts/linkerd/templates/controller.yaml b/charts/linkerd/templates/controller.yaml
@@ -104,7 +104,7 @@ spec:
             path: /ready
             port: 9995
         {{- if eq .HighAvailability true -}}
-        {{- include "linkerd.resources" .PublicAPIResources | nindent 8 }}
+        {{- include "partials.resources" .PublicAPIResources | nindent 8 }}
         {{- end }}
         securityContext:
           runAsUser: {{.ControllerUID}}
@@ -136,7 +136,7 @@ spec:
             path: /ready
             port: 9996
         {{- if eq .HighAvailability true -}}
-        {{- include "linkerd.resources" .DestinationResources | nindent 8 }}
+        {{- include "partials.resources" .DestinationResources | nindent 8 }}
         {{- end }}
         securityContext:
           runAsUser: {{.ControllerUID}}

diff --git a/charts/linkerd/templates/grafana.yaml b/charts/linkerd/templates/grafana.yaml
@@ -135,7 +135,7 @@ spec:
             path: /api/health
             port: 3000
         {{- if eq .HighAvailability true -}}
-        {{- include "linkerd.resources" .GrafanaResources | nindent 8 }}
+        {{- include "partials.resources" .GrafanaResources | nindent 8 }}
         {{- end }}
         securityContext:
           runAsUser: 472

diff --git a/charts/linkerd/templates/heartbeat.yaml b/charts/linkerd/templates/heartbeat.yaml
@@ -37,7 +37,7 @@ spec:
             - "-controller-namespace={{.Namespace}}"
             - "-log-level={{.ControllerLogLevel}}"
             {{- if eq .HighAvailability true -}}
-            {{- include "linkerd.resources" .HeartbeatResources | nindent 12 }}
+            {{- include "partials.resources" .HeartbeatResources | nindent 12 }}
             {{- end -}}
             securityContext:
               runAsUser: {{.ControllerUID}}

diff --git a/charts/partials/templates/_proxy-init.tpl b/charts/partials/templates/_proxy-init.tpl
@@ -13,7 +13,7 @@
   image: {{.Image.Name}}:{{.Image.Version}}
   imagePullPolicy: {{.Image.PullPolicy}}
   name: linkerd-init
-  {{- include "partials.resource" .ResourceRequirements | nindent 2 }}
+  {{- include "partials.resources" .ResourceRequirements | nindent 2 }}
   securityContext:
     allowPrivilegeEscalation: false
     capabilities:

diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl
@@ -71,7 +71,7 @@
       port: {{.Port.Admin}}
     initialDelaySeconds: 2
   {{- if eq .HighAvailability true -}}
-  {{- include "partials.resource" .ResourceRequirements | nindent 2 -}}
+  {{- include "partials.resources" .ResourceRequirements | nindent 2 -}}
   {{- end }}
   securityContext:
     allowPrivilegeEscalation: false

diff --git a/charts/partials/templates/_resource.tpl b/charts/partials/templates/_resource.tpl
diff --git a/charts/linkerd/templates/_resources.tpl → charts/partials/templates/_resources.tpl b/charts/linkerd/templates/_resources.tpl → charts/partials/templates/_resources.tpl
@@ -1,5 +1,4 @@
-{{/* Specify resource requests and limits for workloads */}}
-{{- define "linkerd.resources" -}}
+{{- define "partials.resources" -}}
 resources:
   {{- if or .CPU.Limit .Memory.Limit }}
   limits:
@@ -19,4 +18,4 @@ resources:
     memory: {{.}}
     {{- end }}
   {{- end }}
-{{- end -}}
+{{- end }}