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 21fa7e2fb..058e57894 100755 --- a/olm_deploy/scripts/catalog-deploy.sh +++ b/olm_deploy/scripts/catalog-deploy.sh @@ -13,7 +13,7 @@ export IMAGE_ELASTICSEARCH_OPERATOR=${IMAGE_ELASTICSEARCH_OPERATOR:-registry.ci. export IMAGE_ELASTICSEARCH6=${IMAGE_ELASTICSEARCH6:-registry.ci.openshift.org/${LOGGING_IS}/${LOGGING_ES_VERSION}:logging-elasticsearch6} export IMAGE_ELASTICSEARCH_PROXY=${IMAGE_ELASTICSEARCH_PROXY:-registry.ci.openshift.org/${LOGGING_IS}/${LOGGING_ES_PROXY_VERSION}:elasticsearch-proxy} export IMAGE_LOGGING_KIBANA6=${IMAGE_LOGGING_KIBANA6:-registry.ci.openshift.org/${LOGGING_IS}/${LOGGING_KIBANA_VERSION}:logging-kibana6} -export IMAGE_CURATOR5=${IMAGE_CURATOR5:-registry.ci.openshift.org/${LOGGING_IS}/${LOGGING_CURATOR_VERSION}:logging-curator5} +export IMAGE_LOGGING_CURATOR5=${IMAGE_LOGGING_CURATOR5:-registry.ci.openshift.org/${LOGGING_IS}/${LOGGING_CURATOR_VERSION}:logging-curator5} export IMAGE_OAUTH_PROXY=${IMAGE_OAUTH_PROXY:-registry.ci.openshift.org/ocp/${OCP_VERSION}:oauth-proxy} ELASTICSEARCH_OPERATOR_NAMESPACE=${ELASTICSEARCH_OPERATOR_NAMESPACE:-openshift-operators-redhat} @@ -24,7 +24,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/registry-init.sh b/olm_deploy/scripts/registry-init.sh index 827b38f53..49cc69860 100755 --- a/olm_deploy/scripts/registry-init.sh +++ b/olm_deploy/scripts/registry-init.sh @@ -12,7 +12,7 @@ IMAGE_ELASTICSEARCH6=${IMAGE_ELASTICSEARCH6:-quay.io/openshift-logging/elasticse IMAGE_ELASTICSEARCH_PROXY=${IMAGE_ELASTICSEARCH_PROXY:-quay.io/openshift-logging/elasticsearch-proxy:1.0} IMAGE_OAUTH_PROXY=${IMAGE_OAUTH_PROXY:-quay.io/openshift/origin-oauth-proxy:latest} IMAGE_LOGGING_KIBANA6=${IMAGE_LOGGING_KIBANA6:-quay.io/openshift-logging/kibana6:6.8.1} -IMAGE_CURATOR5=${IMAGE_CURATOR5:-quay.io/openshift-logging/curator5:5.8.1} +IMAGE_LOGGING_CURATOR5=${IMAGE_LOGGING_CURATOR5:-quay.io/openshift-logging/curator5:5.8.1} # update the manifest with the image built by ci sed -i "s,quay.io/openshift-logging/elasticsearch-operator:latest,${IMAGE_ELASTICSEARCH_OPERATOR}," /manifests/*clusterserviceversion.yaml @@ -21,7 +21,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