Updating values.yaml to use single resources

stakater · May 19, 2022 · 63156ba · 63156ba
1 parent 81f0597
commit 63156ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/charts/ingressmonitorcontroller/templates/deployment.yaml b/charts/ingressmonitorcontroller/templates/deployment.yaml
@@ -59,10 +59,10 @@ spec:
         envFrom:
         {{- toYaml .Values.envFrom | nindent 8 }}
         {{- end }}
-        {{ if .Values.kube-rbac-proxy.resources }}
+        {{- if .Values.resources }}
          resources:
-{{ toYaml .Values.kube-rbac-proxy.resources | indent 10 }}
-        {{ end }}   
+{{ toYaml .Values.resources | indent 10 }}
+        {{- end }}   
         name: manager
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -78,10 +78,10 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
-        {{ if .Values.manager.resources }}
-         resources:
-{{ toYaml .Values.manager.resources | indent 10 }}
-        {{ end }}   
+        {{- if .Values.resources }}
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+        {{- end }}   
       terminationGracePeriodSeconds: 10
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml
@@ -15,12 +15,6 @@ kube-rbac-proxy:
     repository: gcr.io/kubebuilder/kube-rbac-proxy
     tag: v0.8.0
     pullPolicy: IfNotPresent
-  resources:
-    {}
-
-manager:
-  resources:
-    {}
 
 # Partial override for ingress-monitor-controller.fullname template (will keep the release name)
 nameOverride: ""