Commit 3b1d905e authored by Tiger Watson's avatar Tiger Watson
Browse files

Merge branch 'fix-issue-257' into 'master' 

fix: create pull secret if a deploy token exists

Closes #257

See merge request https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/352



Merged-by: default avatarTiger Watson <twatson@gitlab.com>
Approved-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
Approved-by: default avatarTiger Watson <twatson@gitlab.com>
Co-authored-by: default avatarHugo "ThePooN" Denizart <thepoon@cartooncraft.fr>
parents 3be643e8 7c6153fb

src/bin/auto-deploy

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ function write_environment_values_file() { 
  echo "deploymentApiVersion: apps/v1" >"$AUTO_DEPLOY_ENVIRONMENT_VALUES_FILE"



  # Helm 3 does not like `--set image.secrets[0]=""`

  if [[ "$CI_PROJECT_VISIBILITY" != "public" ]]; then

  if [[ "$CI_PROJECT_VISIBILITY" != "public" || -n "$CI_DEPLOY_PASSWORD" ]]; then

    echo "image: { secrets: [ { name: gitlab-registry-${CI_PROJECT_PATH_SLUG} } ] }" >>"$AUTO_DEPLOY_ENVIRONMENT_VALUES_FILE"

  else

    echo "image: { secrets: null }" >>"$AUTO_DEPLOY_ENVIRONMENT_VALUES_FILE"
@@ -135,7 +135,7 @@ function write_environment_values_file() { 


function create_secret() {

  echo "Create secret..."

  if [[ "$CI_PROJECT_VISIBILITY" == "public" ]]; then

  if [[ "$CI_PROJECT_VISIBILITY" == "public" && -z "$CI_DEPLOY_PASSWORD" ]]; then

    return

  fi