Commit 030cd212 authored by James Fargher's avatar James Fargher
Browse files

feat: upgraded to kubectl v1.13.12 and helm v2.15.1

parent 928b218d

.gitlab-ci.yml

+9 −3
Original line number Diff line number Diff line 
variables:

  DOCKER_DRIVER: overlay2



  HELM_VERSION: 2.14.0

  KUBERNETES_VERSION: 1.11.10

  HELM_VERSION: 2.15.1

  KUBERNETES_VERSION: 1.13.12

  GLIBC_VERSION: 2.28-r0



  BUILD_IMAGE_NAME: "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"
@@ -19,7 +20,12 @@ build: 
  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"

  script:

    - docker build --build-arg "HELM_VERSION=$HELM_VERSION" --build-arg "KUBERNETES_VERSION=$KUBERNETES_VERSION" --tag "$BUILD_IMAGE_NAME" .

    - >-

       docker build

       --build-arg "HELM_VERSION=$HELM_VERSION"

       --build-arg "KUBERNETES_VERSION=$KUBERNETES_VERSION"

       --build-arg "GLIBC_VERSION=$GLIBC_VERSION"

       --tag "$BUILD_IMAGE_NAME" .

    - docker push "$BUILD_IMAGE_NAME"



.test-job: &test-job

Dockerfile

+9 −11
Original line number Diff line number Diff line 
FROM alpine:latest



ARG HELM_VERSION

ARG KUBERNETES_VERSION



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



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

ARG GLIBC_VERSION



COPY src/ build/



# Install Dependencies

RUN apk add -U openssl curl tar gzip bash ca-certificates git \

RUN apk add --no-cache openssl curl tar gzip bash \

  && curl -sSL -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \

  && curl -sSL -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk \

  && apk add glibc-2.28-r0.apk \

  && rm glibc-2.28-r0.apk \

  && curl -sS "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx \

  && mv linux-amd64/helm /usr/bin/ \

  && mv linux-amd64/tiller /usr/bin/ \

  && curl -sSL -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl" \

  && chmod +x /usr/bin/kubectl

  && curl -sSL -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \

  && apk add glibc-${GLIBC_VERSION}.apk \

  && rm glibc-${GLIBC_VERSION}.apk



RUN ln -s /build/bin/* /usr/local/bin/