Commit 25aa55a5 authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'ci-use-single-helm-install-image-version' into 'master' 

feat: use HELM_INSTALL_IMAGE_VERSION upstream tag

See merge request gitlab-org/cluster-integration/auto-deploy-image!283
parents a6e351b7 38cee550

.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.7.1'

  KUBERNETES_VERSION: '1.20.11'

  ALPINE_VERSION: '3.14'

  # See https://gitlab.com/gitlab-org/cluster-integration/helm-install-image/container_registry/3232113

  HELM_INSTALL_IMAGE_VERSION: v0.241-helm-3.7.2-kube-1.21.5-alpine-3.15



  GLIBC_VERSION: 2.31-r0



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

.gitlab/ci/build.gitlab-ci.yml

+1 −3
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ build: 
    - >-

       docker buildx build

       --platform "$PLATFORMS"

       --build-arg "HELM_VERSION=$HELM_VERSION"

       --build-arg "KUBERNETES_VERSION=$KUBERNETES_VERSION"

       --build-arg "ALPINE_VERSION=$ALPINE_VERSION"

       --build-arg "HELM_INSTALL_IMAGE_VERSION=$HELM_INSTALL_IMAGE_VERSION"

       --build-arg "GLIBC_VERSION=$GLIBC_VERSION"

       --tag "$BUILD_IMAGE_NAME"

       --tag "$BUILD_IMAGE_LATEST"

Dockerfile

+2 −4
Original line number Diff line number Diff line 
ARG HELM_VERSION

ARG KUBERNETES_VERSION

ARG ALPINE_VERSION

ARG HELM_INSTALL_IMAGE_VERSION



FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/${HELM_VERSION}-kube-${KUBERNETES_VERSION}-alpine-${ALPINE_VERSION}"

FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image:${HELM_INSTALL_IMAGE_VERSION}"



# https://github.com/sgerrand/alpine-pkg-glibc

ARG GLIBC_VERSION