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

Merge branch 'master' into beta-to-master

parents 07fd14b2 0c4d8897

.gitlab-ci.yml

+2 −1
Changes for .gitlab-ci.yml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ variables: 
  DOCKER_DRIVER: overlay2



  HELM_VERSION: 3.2.4

  KUBERNETES_VERSION: 1.13.12

  KUBERNETES_VERSION: 1.15.12

  ALPINE_VERSION: '3.12'

  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 −0
Changes for .gitlab/ci/build.gitlab-ci.yml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ build: 
       docker build

       --build-arg "HELM_VERSION=$HELM_VERSION"

       --build-arg "KUBERNETES_VERSION=$KUBERNETES_VERSION"

       --build-arg "ALPINE_VERSION=$ALPINE_VERSION"

       --build-arg "GLIBC_VERSION=$GLIBC_VERSION"

       --tag "$BUILD_IMAGE_NAME" .

    - docker push "$BUILD_IMAGE_NAME"

.gitlab/ci/release.gitlab-ci.yml

+3 −3
Changes for .gitlab/ci/release.gitlab-ci.yml: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ publish-dryrun: 
  script:

    - semantic-release -d |tee output.log

    # Check if the bundled chart version matches the next auto-deploy-image version.

    - git diff @..@^ --name-only | grep 'assets/auto-deploy-app'

    - if [[ "$?" != "0" ]]; then echo 'This change does not contain changes for the chart. Skip the validation' && exit 0; fi

    - has_chart_changes=$(git diff @..@^ --name-only | grep 'assets/auto-deploy-app' && exit 0 || echo -n)

    - if [ -z "$has_chart_changes" ]; then echo 'This change does not contain changes for the chart. Skip the validation'; exit 0; fi

    - next_release_version=$(cat output.log | grep -oP "The next release version is \K.*$") || true

    - bundled_chart_version=$(cat assets/auto-deploy-app/Chart.yaml | grep -oP "version:\s*\K.*$")

    - echo "next_release_version is $next_release_version"
@@ -64,7 +64,7 @@ publish-dryrun: 
        cat <<- EOS

      [WARN] auto-deploy-app chart version outdated!

      This merge request changes auto-deploy-app chart, however, the chart version is not updated yet.

      Please set ${next_release_version} to the version column in assets/auto-deploy-app/Chart.yaml to resovle this error.

      Please set ${next_release_version} to the version column in assets/auto-deploy-app/Chart.yaml to resolve this error.

      EOS

      exit 1

      fi

Dockerfile

+2 −1
Changes for Dockerfile: 2 added lines, 1 removed line.
Original line number Diff line number Diff line 
ARG HELM_VERSION

ARG KUBERNETES_VERSION

ARG ALPINE_VERSION



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

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



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

ARG GLIBC_VERSION