Commit 4392d927 authored by Thong Kuah's avatar Thong Kuah
Browse files

Merge branch 'fix-registry-secret-name' into 'master' 

feat: registry secret name https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/issues/26

See merge request gitlab-org/cluster-integration/auto-deploy-image!46
parents d692f0cd 75aedf29

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ test-create-secret: 
    CI_PROJECT_VISIBILITY: private

  script:

    - auto-deploy create_secret

    - kubectl get secret gitlab-registry -n $KUBE_NAMESPACE

    - kubectl get secret "gitlab-registry-${CI_PROJECT_PATH_SLUG}" -n $KUBE_NAMESPACE



# This template is used for the publish jobs, which do the following:

#   * Check to see if there is a version bump based on
@@ -197,7 +197,7 @@ test-create-secret-public-project: 
    KUBE_NAMESPACE: default

  script:

    - auto-deploy create_secret

    - kubectl get secret gitlab-registry -n $KUBE_NAMESPACE && expected_error || failed_as_expected

    - kubectl get secret "gitlab-registry-${CI_PROJECT_PATH_SLUG}" -n $KUBE_NAMESPACE && expected_error || failed_as_expected



test-persist-environment-url:

  <<: *test-job

src/bin/auto-deploy

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ function create_secret() { 
  fi



  kubectl create secret -n "$KUBE_NAMESPACE" \

    docker-registry gitlab-registry \

    docker-registry "gitlab-registry-${CI_PROJECT_PATH_SLUG}" \

    --docker-server="$CI_REGISTRY" \

    --docker-username="${CI_DEPLOY_USER:-$CI_REGISTRY_USER}" \

    --docker-password="${CI_DEPLOY_PASSWORD:-$CI_REGISTRY_PASSWORD}" \
@@ -127,7 +127,7 @@ function deploy() { 


  local secret_name

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

    secret_name='gitlab-registry'

    secret_name="gitlab-registry-${CI_PROJECT_PATH_SLUG}"

  else

    secret_name=''

  fi