From 4ac87218cd69227be3b95c712e5c6b8bf6e23eff Mon Sep 17 00:00:00 2001 From: dkwon17 Date: Fri, 21 Feb 2025 02:32:16 +0000 Subject: [PATCH 1/2] chore: update kube-rbac-proxy image to quay.io/brancz/kube-rbac-proxy:v0.13.1 Signed-off-by: dkwon17 --- build/scripts/generate_deployment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/scripts/generate_deployment.sh b/build/scripts/generate_deployment.sh index ad8adb434..e91be2d64 100755 --- a/build/scripts/generate_deployment.sh +++ b/build/scripts/generate_deployment.sh @@ -177,7 +177,7 @@ fi # Run kustomize to build yamls echo "Generating config for Kubernetes" -export RBAC_PROXY_IMAGE="${KUBE_RBAC_PROXY_IMAGE:-gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1}" +export RBAC_PROXY_IMAGE="${KUBE_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}" ${KUSTOMIZE} build "${DEPLOY_DIR}/templates/cert-manager" \ | envsubst "$SUBST_VARS" \ > "${KUBERNETES_DIR}/${COMBINED_FILENAME}" @@ -185,7 +185,7 @@ unset RBAC_PROXY_IMAGE echo "File saved to ${KUBERNETES_DIR}/${COMBINED_FILENAME}" echo "Generating config for OpenShift" -export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1}" +export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}" ${KUSTOMIZE} build "${DEPLOY_DIR}/templates/service-ca" \ | envsubst "$SUBST_VARS" \ > "${OPENSHIFT_DIR}/${COMBINED_FILENAME}" @@ -194,7 +194,7 @@ echo "File saved to ${OPENSHIFT_DIR}/${COMBINED_FILENAME}" if $GEN_OLM; then echo "Generating base deployment files for OLM" - export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1}" + export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}" export NAMESPACE=openshift-operators # Generate .spec.relatedImages for CSV based on deployment TMPCSV="csv.tmp.yaml" From c99361e8a9cd60cd87293ee0367d881dd5ed5542 Mon Sep 17 00:00:00 2001 From: dkwon17 Date: Fri, 21 Feb 2025 02:40:39 +0000 Subject: [PATCH 2/2] chore: regenerate bundle and deployment to use new kube-rbac-proxy Signed-off-by: dkwon17 --- .../devworkspace-operator.clusterserviceversion.yaml | 6 +++--- deploy/deployment/kubernetes/combined.yaml | 4 ++-- .../objects/devworkspace-controller-manager.Deployment.yaml | 4 ++-- deploy/deployment/openshift/combined.yaml | 4 ++-- .../objects/devworkspace-controller-manager.Deployment.yaml | 4 ++-- deploy/templates/components/csv/clusterserviceversion.yaml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml b/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml index 37e98323a..11f7a03a4 100644 --- a/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml +++ b/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml @@ -340,7 +340,7 @@ spec: - name: RELATED_IMAGE_devworkspace_webhook_server value: quay.io/devfile/devworkspace-controller:next - name: RELATED_IMAGE_kube_rbac_proxy - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + value: quay.io/brancz/kube-rbac-proxy:v0.13.1 - name: RELATED_IMAGE_project_clone value: quay.io/devfile/project-clone:next - name: WATCH_NAMESPACE @@ -414,7 +414,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + image: quay.io/brancz/kube-rbac-proxy:v0.13.1 name: kube-rbac-proxy ports: - containerPort: 8443 @@ -481,7 +481,7 @@ spec: relatedImages: - image: quay.io/devfile/devworkspace-controller:next name: devworkspace_webhook_server - - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + - image: quay.io/brancz/kube-rbac-proxy:v0.13.1 name: kube_rbac_proxy - image: quay.io/devfile/project-clone:next name: project_clone diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index eb4307a43..d44882e7b 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -25313,7 +25313,7 @@ spec: - name: RELATED_IMAGE_devworkspace_webhook_server value: quay.io/devfile/devworkspace-controller:next - name: RELATED_IMAGE_kube_rbac_proxy - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + value: quay.io/brancz/kube-rbac-proxy:v0.13.1 - name: RELATED_IMAGE_project_clone value: quay.io/devfile/project-clone:next - name: WATCH_NAMESPACE @@ -25389,7 +25389,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + image: quay.io/brancz/kube-rbac-proxy:v0.13.1 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml b/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml index ec6887730..b71c6fca7 100644 --- a/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml +++ b/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml @@ -29,7 +29,7 @@ spec: - name: RELATED_IMAGE_devworkspace_webhook_server value: quay.io/devfile/devworkspace-controller:next - name: RELATED_IMAGE_kube_rbac_proxy - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + value: quay.io/brancz/kube-rbac-proxy:v0.13.1 - name: RELATED_IMAGE_project_clone value: quay.io/devfile/project-clone:next - name: WATCH_NAMESPACE @@ -105,7 +105,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + image: quay.io/brancz/kube-rbac-proxy:v0.13.1 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index b2c84b66b..58edcf702 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -25315,7 +25315,7 @@ spec: - name: RELATED_IMAGE_devworkspace_webhook_server value: quay.io/devfile/devworkspace-controller:next - name: RELATED_IMAGE_kube_rbac_proxy - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + value: quay.io/brancz/kube-rbac-proxy:v0.13.1 - name: RELATED_IMAGE_project_clone value: quay.io/devfile/project-clone:next - name: WATCH_NAMESPACE @@ -25391,7 +25391,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + image: quay.io/brancz/kube-rbac-proxy:v0.13.1 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml b/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml index 729c287a7..9ded74de8 100644 --- a/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml +++ b/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml @@ -29,7 +29,7 @@ spec: - name: RELATED_IMAGE_devworkspace_webhook_server value: quay.io/devfile/devworkspace-controller:next - name: RELATED_IMAGE_kube_rbac_proxy - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + value: quay.io/brancz/kube-rbac-proxy:v0.13.1 - name: RELATED_IMAGE_project_clone value: quay.io/devfile/project-clone:next - name: WATCH_NAMESPACE @@ -105,7 +105,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + image: quay.io/brancz/kube-rbac-proxy:v0.13.1 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/deploy/templates/components/csv/clusterserviceversion.yaml b/deploy/templates/components/csv/clusterserviceversion.yaml index 2db5e044d..8e7982fd9 100644 --- a/deploy/templates/components/csv/clusterserviceversion.yaml +++ b/deploy/templates/components/csv/clusterserviceversion.yaml @@ -99,7 +99,7 @@ spec: relatedImages: - image: quay.io/devfile/devworkspace-controller:next name: devworkspace_webhook_server - - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + - image: quay.io/brancz/kube-rbac-proxy:v0.13.1 name: kube_rbac_proxy - image: quay.io/devfile/project-clone:next name: project_clone