From 62e6850ff1e755e362ab07e39a22bd3f8349b482 Mon Sep 17 00:00:00 2001 From: The Oh Brothers Bot Date: Fri, 17 Nov 2023 00:45:04 +0000 Subject: [PATCH] Enhancement: Bump kubectl 1.25 variants to 1.25.16 Signed-off-by: The Oh Brothers Bot --- .github/workflows/ci-master-pr.yml | 72 +++++++++---------- README.md | 4 +- generate/definitions/versions.json | 2 +- .../Dockerfile | 57 +++++++++++++++ .../docker-entrypoint.sh | 10 +++ variants/1.25.16/Dockerfile | 19 +++++ variants/1.25.16/docker-entrypoint.sh | 10 +++ 7 files changed, 135 insertions(+), 39 deletions(-) create mode 100644 variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/Dockerfile create mode 100644 variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/docker-entrypoint.sh create mode 100644 variants/1.25.16/Dockerfile create mode 100644 variants/1.25.16/docker-entrypoint.sh diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 67d7dfb..108feb0 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -592,7 +592,7 @@ jobs: rm -rf /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache - build-1-25-15: + build-1-25-16: runs-on: ubuntu-latest steps: - name: Checkout @@ -623,9 +623,9 @@ jobs: uses: actions/cache@v3 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-1.25.15-${{ github.sha }} + key: ${{ runner.os }}-buildx-1.25.16-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-1.25.15- + ${{ runner.os }}-buildx-1.25.16- ${{ runner.os }}-buildx- - name: Login to Docker Hub registry @@ -638,7 +638,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-25-15 + id: prep-1-25-16 run: | set -e @@ -651,7 +651,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.25.15" + VARIANT="1.25.16" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -661,51 +661,51 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.25.15 - Build (PRs) + - name: 1.25.16 - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v3 with: - context: variants/1.25.15 + context: variants/1.25.16 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-25-15.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.25.15 - Build and push (master) + - name: 1.25.16 - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v3 with: - context: variants/1.25.15 + context: variants/1.25.16 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-25-15.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.25.15 - Build and push (release) + - name: 1.25.16 - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v3 with: - context: variants/1.25.15 + context: variants/1.25.16 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-25-15.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max # This step generates the docker tags - name: Prepare - id: prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh run: | set -e @@ -718,7 +718,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.25.15-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.25.16-envsubst-git-jq-kustomize-sops-ssh" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -728,45 +728,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.25.15-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v3 with: - context: variants/1.25.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.25.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v3 with: - context: variants/1.25.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.25.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v3 with: - context: variants/1.25.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -2829,7 +2829,7 @@ jobs: - build-1-28-4 - build-1-27-8 - build-1-26-11 - - build-1-25-15 + - build-1-25-16 - build-1-24-17 - build-1-23-17 - build-1-22-17 @@ -2857,7 +2857,7 @@ jobs: - build-1-28-4 - build-1-27-8 - build-1-26-11 - - build-1-25-15 + - build-1-25-16 - build-1-24-17 - build-1-23-17 - build-1-22-17 @@ -2887,7 +2887,7 @@ jobs: - build-1-28-4 - build-1-27-8 - build-1-26-11 - - build-1-25-15 + - build-1-25-16 - build-1-24-17 - build-1-23-17 - build-1-22-17 diff --git a/README.md b/README.md index 9ef1ca7..3e36540 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ Dockerized `kubectl` with useful tools. | `:1.27.8-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.27.8-envsubst-git-jq-kustomize-sops-ssh) | | `:1.26.11` | [View](variants/1.26.11) | | `:1.26.11-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.26.11-envsubst-git-jq-kustomize-sops-ssh) | -| `:1.25.15` | [View](variants/1.25.15) | -| `:1.25.15-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.25.15-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.25.16` | [View](variants/1.25.16) | +| `:1.25.16-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh) | | `:1.24.17` | [View](variants/1.24.17) | | `:1.24.17-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh) | | `:1.23.17` | [View](variants/1.23.17) | diff --git a/generate/definitions/versions.json b/generate/definitions/versions.json index 069fe2e..bcb6628 100644 --- a/generate/definitions/versions.json +++ b/generate/definitions/versions.json @@ -4,7 +4,7 @@ "1.28.4", "1.27.8", "1.26.11", - "1.25.15", + "1.25.16", "1.24.17", "1.23.17", "1.22.17", diff --git a/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/Dockerfile b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/Dockerfile new file mode 100644 index 0000000..897dcd9 --- /dev/null +++ b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/Dockerfile @@ -0,0 +1,57 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.25.16/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +RUN set -eux; \ + wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \ + chmod +x /usr/local/bin/sops; \ + sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \ + sops --version + +RUN apk add --no-cache gnupg + +RUN apk add --no-cache openssh-client + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/docker-entrypoint.sh b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.25.16/Dockerfile b/variants/1.25.16/Dockerfile new file mode 100644 index 0000000..6135b48 --- /dev/null +++ b/variants/1.25.16/Dockerfile @@ -0,0 +1,19 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.25.16/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.25.16/docker-entrypoint.sh b/variants/1.25.16/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.25.16/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file