From afeab5cd6ed4389a462b0490ee68f2d6617337c0 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 2 Sep 2021 10:48:16 +0300 Subject: [PATCH] Fix olm deploy env naming for curator operand image --- olm_deploy/operatorregistry/registry-deployment.yaml | 4 ++-- olm_deploy/scripts/catalog-deploy.sh | 2 +- olm_deploy/scripts/env.sh | 2 +- olm_deploy/scripts/registry-init.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/olm_deploy/operatorregistry/registry-deployment.yaml b/olm_deploy/operatorregistry/registry-deployment.yaml index 41c2df1bd..a441049d6 100644 --- a/olm_deploy/operatorregistry/registry-deployment.yaml +++ b/olm_deploy/operatorregistry/registry-deployment.yaml @@ -35,8 +35,8 @@ spec: value: ${IMAGE_OAUTH_PROXY} - name: IMAGE_LOGGING_KIBANA6 value: ${IMAGE_LOGGING_KIBANA6} - - name: IMAGE_CURATOR5 - value: ${IMAGE_CURATOR5} + - name: IMAGE_LOGGING_CURATOR5 + value: ${IMAGE_LOGGING_CURATOR5} containers: - name: elasticsearch-operator-registry diff --git a/olm_deploy/scripts/catalog-deploy.sh b/olm_deploy/scripts/catalog-deploy.sh index bb7128802..ab55db423 100755 --- a/olm_deploy/scripts/catalog-deploy.sh +++ b/olm_deploy/scripts/catalog-deploy.sh @@ -10,7 +10,7 @@ echo "kube rbac proxy: ${IMAGE_KUBE_RBAC_PROXY}" echo "elastic6: ${IMAGE_ELASTICSEARCH6}" echo "elasticsearch proxy: ${IMAGE_ELASTICSEARCH_PROXY}" echo "kibana: ${IMAGE_LOGGING_KIBANA6}" -echo "curator5: ${IMAGE_CURATOR5}" +echo "curator5: ${IMAGE_LOGGING_CURATOR5}" echo "oauth proxy: ${IMAGE_OAUTH_PROXY}" echo "In namespace: ${ELASTICSEARCH_OPERATOR_NAMESPACE}" diff --git a/olm_deploy/scripts/env.sh b/olm_deploy/scripts/env.sh index 571fa1e77..2a9055ba8 100644 --- a/olm_deploy/scripts/env.sh +++ b/olm_deploy/scripts/env.sh @@ -21,6 +21,6 @@ export IMAGE_ELASTICSEARCH_OPERATOR=${IMAGE_ELASTICSEARCH_OPERATOR:-quay.io/${LO export IMAGE_ELASTICSEARCH6=${IMAGE_ELASTICSEARCH6:-quay.io/${LOGGING_IS}/elasticsearch6:${LOGGING_ES_VERSION}} export IMAGE_ELASTICSEARCH_PROXY=${IMAGE_ELASTICSEARCH_PROXY:-quay.io/${LOGGING_IS}/elasticsearch-proxy:${LOGGING_ES_PROXY_VERSION}} export IMAGE_LOGGING_KIBANA6=${IMAGE_LOGGING_KIBANA6:-quay.io/${LOGGING_IS}/kibana6:${LOGGING_KIBANA_VERSION}} -export IMAGE_CURATOR5=${IMAGE_CURATOR5:-quay.io/${LOGGING_IS}/curator5:${LOGGING_CURATOR_VERSION}} +export IMAGE_LOGGING_CURATOR5=${IMAGE_LOGGING_CURATOR5:-quay.io/${LOGGING_IS}/curator5:${LOGGING_CURATOR_VERSION}} export ELASTICSEARCH_OPERATOR_NAMESPACE=${ELASTICSEARCH_OPERATOR_NAMESPACE:-openshift-operators-redhat} diff --git a/olm_deploy/scripts/registry-init.sh b/olm_deploy/scripts/registry-init.sh index 6eabce4c0..8e9994127 100755 --- a/olm_deploy/scripts/registry-init.sh +++ b/olm_deploy/scripts/registry-init.sh @@ -14,7 +14,7 @@ sed -i "s,quay.io/openshift-logging/elasticsearch6:6.8.1,${IMAGE_ELASTICSEARCH6} sed -i "s,quay.io/openshift-logging/elasticsearch-proxy:1.0,${IMAGE_ELASTICSEARCH_PROXY}," /manifests/*clusterserviceversion.yaml sed -i "s,quay.io/openshift/origin-oauth-proxy:latest,${IMAGE_OAUTH_PROXY}," /manifests/*clusterserviceversion.yaml sed -i "s,quay.io/openshift-logging/kibana6:6.8.1,${IMAGE_LOGGING_KIBANA6}," /manifests/*clusterserviceversion.yaml -sed -i "s,quay.io/openshift-logging/curator5:5.8.1,${IMAGE_CURATOR5}," /manifests/*clusterserviceversion.yaml +sed -i "s,quay.io/openshift-logging/curator5:5.8.1,${IMAGE_LOGGING_CURATOR5}," /manifests/*clusterserviceversion.yaml # update the manifest to pull always the operator image for non-CI environments if [ "${OPENSHIFT_CI:-false}" == "false" ] ; then