diff --git a/UPGRADE.md b/UPGRADE.md index f1c32f8..dc6a0b7 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -12,6 +12,7 @@ ## Upgrade from v5.0.0 to v5.1.0 +- removed GCloud-specific docker registry secret creation ([#77](https://github.com/shopsys/deployment/pull/77)) - improved probes and graceful shutdown for storefront ([#76](https://github.com/shopsys/deployment/pull/76)) - added probes for RabbitMQ with graceful shutdown ([#75](https://github.com/shopsys/deployment/pull/75)) - changed container order for Redis ([#74](https://github.com/shopsys/deployment/pull/74)) diff --git a/deploy/parts/deploy.sh b/deploy/parts/deploy.sh index 49278ef..76451b5 100644 --- a/deploy/parts/deploy.sh +++ b/deploy/parts/deploy.sh @@ -26,11 +26,7 @@ echo -n " Delete secret for docker registry " runCommand "SKIP" "kubectl delete secret dockerregistry -n ${PROJECT_NAME}" echo -n " Create new secret for docker registry " -if [ "${GCLOUD_DEPLOY}" = "true" ]; then - runCommand "ERROR" "kubectl create secret docker-registry dockerregistry --docker-server=eu.gcr.io --docker-username _json_key --docker-email ${GCLOUD_CONTAINER_REGISTRY_EMAIL} --docker-password='${GCLOUD_CONTAINER_REGISTRY_ACCOUNT}' -n ${PROJECT_NAME}" -else - runCommand "ERROR" "kubectl create secret docker-registry dockerregistry --docker-server=${CI_REGISTRY} --docker-username=${DEPLOY_REGISTER_USER} --docker-password=${DEPLOY_REGISTER_PASSWORD} -n ${PROJECT_NAME}" -fi +runCommand "ERROR" "kubectl create secret docker-registry dockerregistry --docker-server=${CI_REGISTRY} --docker-username=${DEPLOY_REGISTER_USER} --docker-password=${DEPLOY_REGISTER_PASSWORD} -n ${PROJECT_NAME}" if [ ${RUNNING_PRODUCTION} -eq "0" ] || [ ${#FORCE_HTTP_AUTH_IN_PRODUCTION[@]} -ne "0" ]; then echo -n " Create or update secret for http auth "