Use production ready kube-rbac-proxy from registry.redhat.io (#2962)

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
openshift-knative · Oct 21, 2024 · c44ef73 · c44ef73
1 parent 2c9b9f9
commit c44ef73
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/hack/generate/catalog.sh b/hack/generate/catalog.sh
@@ -150,12 +150,22 @@ function upgrade_service_mesh_proxy_image() {
  yq w --inplace olm-catalog/serverless-operator/project.yaml 'dependencies.service_mesh_proxy' "${sm_proxy_image}"
 }
 
+function upgrade_kube_rbac_proxy_image() {
+ local image image_stream
+ image=$(metadata.get 'dependencies.kube_rbac_proxy')
+ image_stream=$(metadata.get 'requirements.ocpVersion.list[-1]')
+ image=$(latest_konflux_image_sha "${image}" "v${image_stream}")
+ yq w --inplace olm-catalog/serverless-operator/project.yaml 'dependencies.kube_rbac_proxy' "${image}"
+}
+
 function upgrade_dependencies_images {
  if [[ -n "${REGISTRY_REDHAT_IO_USERNAME:-}" ]] || [[ -n "${REGISTRY_REDHAT_IO_PASSWORD:-}" ]]; then
  skopeo login registry.redhat.io -u "${REGISTRY_REDHAT_IO_USERNAME}" -p "${REGISTRY_REDHAT_IO_PASSWORD}"
  fi
 
  upgrade_service_mesh_proxy_image
+
+ upgrade_kube_rbac_proxy_image
 }
 
 logger.info "Upgrading registry.redhat.io images"

diff --git a/hack/generate/csv.sh b/hack/generate/csv.sh
@@ -16,7 +16,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../lib/images.bash"
 client_version="$(metadata.get dependencies.cli)"
 kn_event="${ci_registry_host}/knative/release-${client_version#knative-v}:client-plugin-event"
 
-rbac_proxy="registry.ci.openshift.org/origin/$(metadata.get 'requirements.ocpVersion.list[-1]'):kube-rbac-proxy"
+rbac_proxy=$(metadata.get 'dependencies.kube_rbac_proxy')
 
 default_serverless_operator_images
 default_knative_ingress_images

diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
@@ -928,7 +928,7 @@ spec:
  - name: "IMAGE_eventmesh-backend__controller"
  value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh@sha256:7a538702cfb775d18bee4a17f47104c62a1b0ac747aab851895e079093a73aaa"
  - name: "IMAGE_KUBE_RBAC_PROXY"
- value: "registry.ci.openshift.org/origin/4.17:kube-rbac-proxy"
+ value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6fbeaf03058bb5d6e9e3311a7afe67666e0770532c978b6b57e77ea2851cb085"
  - name: "IMAGE_KN_PLUGIN_EVENT_SENDER"
  value: "registry.ci.openshift.org/knative/release-1.15:client-plugin-event-sender"
  - name: "IMAGE_KN_CLIENT"
@@ -1100,7 +1100,7 @@ spec:
  - name: "IMAGE_eventmesh-backend__controller"
  value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh@sha256:7a538702cfb775d18bee4a17f47104c62a1b0ac747aab851895e079093a73aaa"
  - name: "IMAGE_KUBE_RBAC_PROXY"
- value: "registry.ci.openshift.org/origin/4.17:kube-rbac-proxy"
+ value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6fbeaf03058bb5d6e9e3311a7afe67666e0770532c978b6b57e77ea2851cb085"
  - name: "IMAGE_KN_PLUGIN_EVENT_SENDER"
  value: "registry.ci.openshift.org/knative/release-1.15:client-plugin-event-sender"
  - name: "IMAGE_KN_CLIENT"
@@ -1375,7 +1375,7 @@ spec:
  - name: "IMAGE_eventmesh-backend__controller"
  image: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh@sha256:7a538702cfb775d18bee4a17f47104c62a1b0ac747aab851895e079093a73aaa"
  - name: "IMAGE_KUBE_RBAC_PROXY"
- image: "registry.ci.openshift.org/origin/4.17:kube-rbac-proxy"
+ image: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6fbeaf03058bb5d6e9e3311a7afe67666e0770532c978b6b57e77ea2851cb085"
  - name: "IMAGE_KN_PLUGIN_EVENT_SENDER"
  image: "registry.ci.openshift.org/knative/release-1.15:client-plugin-event-sender"
  - name: "IMAGE_KN_CLIENT"

diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml
@@ -58,6 +58,7 @@ dependencies:
  # backstage-plugins midstream branch or commit
  backstage_plugins_artifacts_branch: release-v1.15
  cli: knative-v1.15
+ kube_rbac_proxy: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6fbeaf03058bb5d6e9e3311a7afe67666e0770532c978b6b57e77ea2851cb085
  func:
  promotion_tag: knative-v1.15
  tekton_s2i: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4