From 8f479a712f49eb5baed065fcec00c987493105dd Mon Sep 17 00:00:00 2001 From: Andrey Taranik Date: Mon, 2 May 2022 11:38:25 +0300 Subject: [PATCH] minor fixes in proxy deployment --- .circleci/ansible/.gitignore | 2 ++ .circleci/config.yml | 7 +++---- .circleci/helm-values/staging.proxy-scram.yaml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.circleci/ansible/.gitignore b/.circleci/ansible/.gitignore index 14a1c155ae..441d9a8b82 100644 --- a/.circleci/ansible/.gitignore +++ b/.circleci/ansible/.gitignore @@ -1,2 +1,4 @@ zenith_install.tar.gz .zenith_current_version +neon_install.tar.gz +.neon_current_version diff --git a/.circleci/config.yml b/.circleci/config.yml index f8787edcfb..2ed079f031 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -579,14 +579,13 @@ jobs: name: Setup helm v3 command: | curl -s https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash - helm repo add zenithdb https://neondatabase.github.io/helm-charts + helm repo add neondatabase https://neondatabase.github.io/helm-charts - run: name: Re-deploy proxy command: | DOCKER_TAG=$(git log --oneline|wc -l) - helm upgrade zenith-proxy zenithdb/zenith-proxy --install -f .circleci/helm-values/staging.proxy.yaml --set image.tag=${DOCKER_TAG} --wait - helm upgrade zenith-proxy-scram zenithdb/zenith-proxy --install -f .circleci/helm-values/staging.proxy-scram.yaml --set image.tag=${DOCKER_TAG} --wait - + helm upgrade zenith-proxy neondatabase/neon-proxy --install -f .circleci/helm-values/staging.proxy.yaml --set image.tag=${DOCKER_TAG} --wait + helm upgrade neon-proxy-scram neondatabase/neon-proxy --install -f .circleci/helm-values/staging.proxy-scram.yaml --set image.tag=${DOCKER_TAG} --wait deploy-release: docker: diff --git a/.circleci/helm-values/staging.proxy-scram.yaml b/.circleci/helm-values/staging.proxy-scram.yaml index 1a9ab239b4..8c7bf835bc 100644 --- a/.circleci/helm-values/staging.proxy-scram.yaml +++ b/.circleci/helm-values/staging.proxy-scram.yaml @@ -6,7 +6,7 @@ image: settings: authBackend: "console" - authEndpoint: "https://console.stage.neon.tech:9095/management/api/v2" + authEndpoint: "http://console-staging.local/management/api/v2/healthz" # -- Additional labels for zenith-proxy pods podLabels: