Improved Helm chart for kube-rbac-proxy image configuration.

redhat-cop · Jun 18, 2021 · ea50e58 · ea50e58
1 parent f26298f
commit ea50e58
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/config/helmchart/templates/manager.yaml b/config/helmchart/templates/manager.yaml
@@ -25,30 +25,33 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-      - command:
       - args:
         - --secure-listen-address=0.0.0.0:8443
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
         - --tls-cert-file=/etc/certs/tls/tls.crt
         - --tls-private-key-file=/etc/certs/tls/tls.key
         - --v=10
-        image: quay.io/coreos/kube-rbac-proxy:v0.5.0
+        image: "{{ .Values.kube_rbac_proxy.image.repository }}:{{ .Values.kube_rbac_proxy.image.tag | default "v0.5.0" }}"
         name: kube-rbac-proxy
         ports:
         - containerPort: 8443
           name: https
         volumeMounts:
         - mountPath: /etc/certs/tls
-          name: tls-cert        
+          name: tls-cert
+        imagePullPolicy: {{ .Values.kube_rbac_proxy.image.pullPolicy }}
+        resources:
+          {{- toYaml .Values.kube_rbac_proxy.resources | nindent 10 }}
+      - command:
         - /manager
         args:
         - --leader-elect
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: {{ .Chart.Name }}
         resources:
-          {{- toYaml .Values.resources | nindent 12 }}
+          {{- toYaml .Values.resources | nindent 10 }}
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/config/helmchart/values.yaml.tpl b/config/helmchart/values.yaml.tpl
@@ -26,3 +26,13 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+kube_rbac_proxy:
+  image:
+    repository: quay.io/coreos/kube-rbac-proxy
+    pullPolicy: IfNotPresent
+    tag: v0.5.0
+  resources:
+    requests:
+      cpu: 100m
+      memory: 20Mi