Commit fc8b7182 authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'helm_new_stable_location' into 'master' 

Use official new location for stable-repo-url

See merge request gitlab-org/cluster-integration/auto-deploy-image!134
parents fa79b149 a87f8c60

.gitlab/ci/chart.gitlab-ci.yml

+2 −4
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ chart:compile_manifests: 
  stage: build

  script:

    - mkdir manifests

    - helm init --client-only

    - helm repo add stable-archive https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive

    - helm init --client-only --stable-repo-url=https://charts.helm.sh/stable

    - helm dependency build .

    - helm template -f values.yaml --output-dir manifests .

  artifacts:
@@ -43,8 +42,7 @@ chart:test: 
  stage: test

  script:

    - apk add --no-cache build-base go

    - helm init --client-only

    - helm repo add stable-archive https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive

    - helm init --client-only --stable-repo-url=https://charts.helm.sh/stable

    - helm dependency build .

    - cd test && GO111MODULE=auto go test .

assets/auto-deploy-app/CONTRIBUTING.md

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ To run the tests, run the following commands from the root of your copy of `auto 


```shell

helm init --client-only               # required only once

helm repo add stable-archive https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive # required only once

helm dependency build .               # required only once

cd test

GO111MODULE=auto go test .            # required for every change to the tests or the template

assets/auto-deploy-app/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

description: GitLab's Auto-deploy Helm Chart

name: auto-deploy-app

version: 1.0.6

version: 1.0.7

icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png

assets/auto-deploy-app/requirements.lock

+3 −3
Original line number Diff line number Diff line 
dependencies:

- name: postgresql

  repository: https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive

  repository: https://charts.helm.sh/stable

  version: 0.7.1

digest: sha256:0a7e2f279e3b8063cfe6365a56601227ff8934fa70a0434df0485bce9590be56

generated: "2020-10-21T09:35:20.464079556+07:00"
 
digest: sha256:66df3bd5a18622e28ed1ecedcceaff19e87f8e2f67baacf871331d64a5fdfa1f

generated: "2020-10-30T20:01:41.436662+13:00"

assets/auto-deploy-app/requirements.yaml

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ dependencies: 
  # We can remove this dependency when we drop support for the legacy instances.

  - name: postgresql

    version: "0.7.1"

    repository: "@stable-archive"

    repository: "@stable"

    condition: postgresql.enabled