Merge pull request ceph#22 from iamniting/image-4.17

Bug 2305274:[release-4.17] Makefile: provide a mechanism to change the kube-rbac-proxy image
parth-gr · Aug 16, 2024 · 9013e7a · 9013e7a
2 parents 50a7daf + a751fdf
commit 9013e7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -10,6 +10,8 @@ NAMESPACE ?= $(NAME_PREFIX)system
 
 IMG ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(IMAGE_NAME):$(IMAGE_TAG)
 
+KUBE_RBAC_PROXY_IMG ?= gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
+
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.29.0
 
@@ -51,6 +53,8 @@ patches:
 images:
 - name: controller
   newName: ${IMG}
+- name: kube-rbac-proxy
+  newName: ${KUBE_RBAC_PROXY_IMG}
 resources:
 - ../config/default
 endef

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -15,7 +15,7 @@ spec:
           capabilities:
             drop:
             - "ALL"
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
+        image: kube-rbac-proxy
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"