Skip to content

Commit

Permalink
Merge pull request #385 from fluxcd/alpine-3.14
Browse files Browse the repository at this point in the history
Update Alpine v3.14 and kubectl v1.21.2
  • Loading branch information
stefanprodan authored Jul 5, 2021
2 parents b7380ab + 5b2711f commit c6fb374
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"

Expand Down

0 comments on commit c6fb374

Please sign in to comment.