diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml index beeea80da7..73b44061fe 100644 --- a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml +++ b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml @@ -3321,7 +3321,7 @@ spec: - -openshift-service-account=ux-backend-server - -openshift-delegate-urls={"/":{"group":"ocs.openshift.io","resource":"storageclusters","namespace":"openshift-storage","verb":"create"}} - -openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt - image: quay.io/openshift/origin-oauth-proxy:latest + image: quay.io/openshift/origin-oauth-proxy:4.15.0 imagePullPolicy: IfNotPresent name: oauth-proxy ports: @@ -3668,6 +3668,6 @@ spec: name: ocs-must-gather - image: quay.io/ocs-dev/ocs-metrics-exporter:latest name: ocs-metrics-exporter - - image: quay.io/openshift/origin-oauth-proxy:latest + - image: quay.io/openshift/origin-oauth-proxy:4.15.0 name: ux-backend-oauth-image version: 4.15.0 diff --git a/hack/common.sh b/hack/common.sh index da52b53d65..08ff88cff8 100644 --- a/hack/common.sh +++ b/hack/common.sh @@ -63,6 +63,7 @@ DEFAULT_OPERATOR_BUNDLE_NAME="ocs-operator-bundle" DEFAULT_FILE_BASED_CATALOG_NAME="ocs-operator-catalog" DEFAULT_METRICS_EXPORTER_IMAGE_NAME="ocs-metrics-exporter" DEFAULT_UX_BACKEND_OAUTH_IMAGE_NAME="openshift/origin-oauth-proxy" +DEFAULT_UX_BACKEND_OAUTH_IMAGE_TAG="4.15.0" IMAGE_REGISTRY="${IMAGE_REGISTRY:-${DEFAULT_IMAGE_REGISTRY}}" REGISTRY_NAMESPACE="${REGISTRY_NAMESPACE:-${DEFAULT_REGISTRY_NAMESPACE}}" @@ -71,13 +72,14 @@ OPERATOR_BUNDLE_NAME="${OPERATOR_BUNDLE_NAME:-${DEFAULT_OPERATOR_BUNDLE_NAME}}" FILE_BASED_CATALOG_NAME="${FILE_BASED_CATALOG_NAME:-${DEFAULT_FILE_BASED_CATALOG_NAME}}" METRICS_EXPORTER_IMAGE_NAME="${METRICS_EXPORTER_IMAGE_NAME:-${DEFAULT_METRICS_EXPORTER_IMAGE_NAME}}" UX_BACKEND_OAUTH_IMAGE_NAME="${UX_BACKEND_OAUTH_IMAGE_NAME:-${DEFAULT_UX_BACKEND_OAUTH_IMAGE_NAME}}" +UX_BACKEND_OAUTH_IMAGE_TAG="${UX_BACKEND_OAUTH_IMAGE_TAG:-${DEFAULT_UX_BACKEND_OAUTH_IMAGE_TAG}}" IMAGE_TAG="${IMAGE_TAG:-${DEFAULT_IMAGE_TAG}}" DEFAULT_OPERATOR_FULL_IMAGE_NAME="${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${OPERATOR_IMAGE_NAME}:${IMAGE_TAG}" DEFAULT_BUNDLE_FULL_IMAGE_NAME="${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${OPERATOR_BUNDLE_NAME}:${IMAGE_TAG}" DEFAULT_FILE_BASED_CATALOG_FULL_IMAGE_NAME="${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${FILE_BASED_CATALOG_NAME}:${IMAGE_TAG}" DEFAULT_METRICS_EXPORTER_FULL_IMAGE_NAME="${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${METRICS_EXPORTER_IMAGE_NAME}:${IMAGE_TAG}" -DEFAULT_UX_BACKEND_OAUTH_FULL_IMAGE_NAME="${IMAGE_REGISTRY}/${UX_BACKEND_OAUTH_IMAGE_NAME}:${IMAGE_TAG}" +DEFAULT_UX_BACKEND_OAUTH_FULL_IMAGE_NAME="${IMAGE_REGISTRY}/${UX_BACKEND_OAUTH_IMAGE_NAME}:${UX_BACKEND_OAUTH_IMAGE_TAG}" OPERATOR_FULL_IMAGE_NAME="${OPERATOR_FULL_IMAGE_NAME:-${DEFAULT_OPERATOR_FULL_IMAGE_NAME}}" BUNDLE_FULL_IMAGE_NAME="${BUNDLE_FULL_IMAGE_NAME:-${DEFAULT_BUNDLE_FULL_IMAGE_NAME}}"