From 073f83f36a94344b679b2fc98b0e71f6af3e4ef1 Mon Sep 17 00:00:00 2001 From: Sebastian Widmer Date: Mon, 20 Jan 2025 11:24:56 +0100 Subject: [PATCH] Replace `gcr.io` `kube-rbac-proxy` image (#221) `gcr.io` is deprecated and will be removed https://cloud.google.com/artifact-registry/docs/transition/prepare-gcr-shutdown --- class/defaults.yml | 6 +++--- component/operator.jsonnet | 4 ++++ ...1_deployment_syn-argocd-operator-controller-manager.yaml | 2 +- ...1_deployment_syn-argocd-operator-controller-manager.yaml | 2 +- ...1_deployment_syn-argocd-operator-controller-manager.yaml | 2 +- ...1_deployment_syn-argocd-operator-controller-manager.yaml | 2 +- ...1_deployment_syn-argocd-operator-controller-manager.yaml | 2 +- ...1_deployment_syn-argocd-operator-controller-manager.yaml | 2 +- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index fac884f3..32eecb92 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -61,9 +61,9 @@ parameters: repository: argoprojlabs/argocd-operator tag: v0.12.2 kube_rbac_proxy: - registry: gcr.io - repository: kubebuilder/kube-rbac-proxy - tag: v0.16.0 + registry: quay.io + repository: brancz/kube-rbac-proxy + tag: v0.18.2 instances: {} diff --git a/component/operator.jsonnet b/component/operator.jsonnet index 6b06d634..92c9ffd1 100644 --- a/component/operator.jsonnet +++ b/component/operator.jsonnet @@ -75,6 +75,10 @@ com.Kustomization( newTag: rbac.tag, newName: '%(registry)s/%(repository)s' % rbac, }, + 'quay.io/brancz/kube-rbac-proxy': { + newTag: rbac.tag, + newName: '%(registry)s/%(repository)s' % rbac, + }, }, kustomize_input, ) diff --git a/tests/golden/defaults/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml b/tests/golden/defaults/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml index 9c88bc8c..ef79a218 100644 --- a/tests/golden/defaults/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml +++ b/tests/golden/defaults/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml @@ -23,7 +23,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/tests/golden/https-catalog/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml b/tests/golden/https-catalog/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml index 9c88bc8c..ef79a218 100644 --- a/tests/golden/https-catalog/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml +++ b/tests/golden/https-catalog/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml @@ -23,7 +23,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/tests/golden/openshift/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml b/tests/golden/openshift/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml index 9c88bc8c..ef79a218 100644 --- a/tests/golden/openshift/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml +++ b/tests/golden/openshift/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml @@ -23,7 +23,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/tests/golden/params/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml b/tests/golden/params/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml index 3d762b21..20407cb6 100644 --- a/tests/golden/params/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml +++ b/tests/golden/params/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml @@ -23,7 +23,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: mymirror.io/kubebuilder/kube-rbac-proxy:v1.1.1 + image: mymirror.io/brancz/kube-rbac-proxy:v1.1.1 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/tests/golden/prometheus/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml b/tests/golden/prometheus/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml index 9c88bc8c..ef79a218 100644 --- a/tests/golden/prometheus/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml +++ b/tests/golden/prometheus/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml @@ -23,7 +23,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/tests/golden/syn-teams/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml b/tests/golden/syn-teams/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml index 9c88bc8c..ef79a218 100644 --- a/tests/golden/syn-teams/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml +++ b/tests/golden/syn-teams/argocd/argocd/10_operator/apps_v1_deployment_syn-argocd-operator-controller-manager.yaml @@ -23,7 +23,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443