Commit 9c1d950c authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'ci-update-k8s-versions' into 'master' 

feat: update Helm to 3.7.1 and kubectl to 1.20

See merge request gitlab-org/cluster-integration/auto-deploy-image!225
parents 53563522 4547d370

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ workflow: 
variables:

  DOCKER_DRIVER: overlay2



  HELM_VERSION: 3.6.3

  KUBERNETES_VERSION: 1.17.17

  ALPINE_VERSION: '3.12'

  HELM_VERSION: '3.7.1'

  KUBERNETES_VERSION: '1.20.11'

  ALPINE_VERSION: '3.14'

  GLIBC_VERSION: 2.31-r0



  BUILD_IMAGE_NAME: "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"

.gitlab/ci/test.gitlab-ci.yml

+6 −5
Original line number Diff line number Diff line
@@ -8,11 +8,12 @@ 
  parallel:

    matrix:

      - K3S_VERSION:

        - v0.9.1 # kube 1.15.4, see https://github.com/rancher/k3s/releases/tag/v0.9.1 and https://github.com/rancher/k3s/releases/tag/v0.9.0

        - v1.16.15-k3s1

        - v1.17.13-k3s1

        - v1.18.10-k3s1

        - v1.19.3-k3s1

        - v1.18.19-k3s1

        - v1.19.9-k3s1

        - v1.20.7-k3s1

        - v1.21.1-k3s1

        - v1.22.2-k3s2



  services:

    - name: registry.gitlab.com/gitlab-org/cluster-integration/test-utils/k3s-gitlab-ci/releases/${K3S_VERSION}

      alias: k3s