From 5b2711f94353bda14232b4cddd7a5b5b46901675 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 5 Jul 2021 14:09:33 +0300 Subject: [PATCH] Update Alpine and kubectl Update Alpine to v3.14 Update kubectl to v1.21.2 Signed-off-by: Stefan Prodan --- .github/workflows/e2e.yaml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 9e9771ed..d2d080d5 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -35,7 +35,7 @@ jobs: - name: Setup Kubectl uses: fluxcd/pkg/actions/kubectl@main with: - version: 1.21.1 + version: 1.21.2 - name: Override Kubebuilder kubectl run: sudo cp /usr/local/bin/kubectl /home/runner/work/kustomize-controller/kustomize-controller/kubebuilder/bin/kubectl - name: Run tests diff --git a/Dockerfile b/Dockerfile index cc827d35..996cfbaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /workspace RUN apk add --no-cache ca-certificates curl -RUN kubectl_ver=1.21.1 && \ +RUN kubectl_ver=1.21.2 && \ arch=${TARGETPLATFORM:-linux/amd64} && \ if [ "$TARGETPLATFORM" == "linux/arm/v7" ]; then arch="linux/arm"; fi && \ curl -sL https://storage.googleapis.com/kubernetes-release/release/v${kubectl_ver}/bin/${arch}/kubectl \ @@ -32,7 +32,7 @@ COPY internal/ internal/ # build RUN CGO_ENABLED=0 go build -a -o kustomize-controller main.go -FROM alpine:3.13 +FROM alpine:3.14 LABEL org.opencontainers.image.source="https://github.com/fluxcd/kustomize-controller"