Move out the RBAC proxy image as templating value (#341)

spotify · Mar 24, 2022 · 0776c83 · 0776c83
1 parent bb01e58
commit 0776c83
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/helm-chart/flink-operator/templates/flink-operator.yaml b/helm-chart/flink-operator/templates/flink-operator.yaml
@@ -58,7 +58,8 @@ spec:
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
         - --v=10
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+        image: {{ .Values.rbacProxyImage.name }}
+        imagePullPolicy: {{ .Values.rbacProxyImage.pullPolicy }}
         ports:
         - containerPort: 8443
           name: https
@@ -71,6 +72,7 @@ spec:
         command:
         - /flink-operator
         image: {{ .Values.operatorImage.name }}
+        imagePullPolicy: {{ .Values.operatorImage.pullPolicy }}
         ports:
         - containerPort: 9443
           name: webhook-server

diff --git a/helm-chart/flink-operator/values.yaml b/helm-chart/flink-operator/values.yaml
@@ -4,7 +4,7 @@ flinkOperatorNamespace:
 
 # Watch custom resources in the namespace, ignore other namespaces. If empty, all namespaces will be watched.
 watchNamespace:
-  name: "flink-job"
+  name: ""
 
 # The number of replicas of the operator Deployment
 replicas: 1
@@ -27,6 +27,11 @@ operatorImage:
   name: ghcr.io/spotify/flink-operator:latest
   pullPolicy: IfNotPresent
 
+# The definition of the kube-rbac-proxy image
+rbacProxyImage:
+  name: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+  pullPolicy: IfNotPresent
+
 # Defines security context for operator container
 securityContext:
   {}