Skip to content

Commit

Permalink
Merge pull request #120 from theohbrothers/enhancement/bump-kubectl-1…
Browse files Browse the repository at this point in the history
….27-variants-to-1.27.8

Enhancement: Bump kubectl 1.27 variants to 1.27.8
  • Loading branch information
theohbrothersbot authored Nov 16, 2023
2 parents 349a461 + c148460 commit 08f9ddc
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 39 deletions.
72 changes: 36 additions & 36 deletions .github/workflows/ci-master-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
build-1-27-7:
build-1-27-8:
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -251,9 +251,9 @@ jobs:
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-1.27.7-${{ github.sha }}
key: ${{ runner.os }}-buildx-1.27.8-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-1.27.7-
${{ runner.os }}-buildx-1.27.8-
${{ runner.os }}-buildx-
- name: Login to Docker Hub registry
Expand All @@ -266,7 +266,7 @@ jobs:

# This step generates the docker tags
- name: Prepare
id: prep-1-27-7
id: prep-1-27-8
run: |
set -e
Expand All @@ -279,7 +279,7 @@ jobs:
# Generate docker image tags
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
VARIANT="1.27.7"
VARIANT="1.27.8"
REF_VARIANT="${REF}-${VARIANT}"
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
Expand All @@ -289,51 +289,51 @@ jobs:
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
- name: 1.27.7 - Build (PRs)
- name: 1.27.8 - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
with:
context: variants/1.27.7
context: variants/1.27.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: false
tags: |
${{ github.repository }}:${{ steps.prep-1-27-7.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8.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.27.7 - Build and push (master)
- name: 1.27.8 - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
with:
context: variants/1.27.7
context: variants/1.27.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: true
tags: |
${{ github.repository }}:${{ steps.prep-1-27-7.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8.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.27.7 - Build and push (release)
- name: 1.27.8 - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
with:
context: variants/1.27.7
context: variants/1.27.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: true
tags: |
${{ github.repository }}:${{ steps.prep-1-27-7.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8.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-27-7-envsubst-git-jq-kustomize-sops-ssh
id: prep-1-27-8-envsubst-git-jq-kustomize-sops-ssh
run: |
set -e
Expand All @@ -346,7 +346,7 @@ jobs:
# Generate docker image tags
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
VARIANT="1.27.7-envsubst-git-jq-kustomize-sops-ssh"
VARIANT="1.27.8-envsubst-git-jq-kustomize-sops-ssh"
REF_VARIANT="${REF}-${VARIANT}"
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
Expand All @@ -356,45 +356,45 @@ jobs:
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
- name: 1.27.7-envsubst-git-jq-kustomize-sops-ssh - Build (PRs)
- name: 1.27.8-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.27.7-envsubst-git-jq-kustomize-sops-ssh
context: variants/1.27.8-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-27-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8-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.27.7-envsubst-git-jq-kustomize-sops-ssh - Build and push (master)
- name: 1.27.8-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.27.7-envsubst-git-jq-kustomize-sops-ssh
context: variants/1.27.8-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-27-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8-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.27.7-envsubst-git-jq-kustomize-sops-ssh - Build and push (release)
- name: 1.27.8-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.27.7-envsubst-git-jq-kustomize-sops-ssh
context: variants/1.27.8-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-27-7-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-1-27-8-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

Expand Down Expand Up @@ -2827,7 +2827,7 @@ jobs:
update-draft-release:
needs:
- build-1-28-4
- build-1-27-7
- build-1-27-8
- build-1-26-10
- build-1-25-15
- build-1-24-17
Expand Down Expand Up @@ -2855,7 +2855,7 @@ jobs:
publish-draft-release:
needs:
- build-1-28-4
- build-1-27-7
- build-1-27-8
- build-1-26-10
- build-1-25-15
- build-1-24-17
Expand Down Expand Up @@ -2885,7 +2885,7 @@ jobs:
update-dockerhub-description:
needs:
- build-1-28-4
- build-1-27-7
- build-1-27-8
- build-1-26-10
- build-1-25-15
- build-1-24-17
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Dockerized `kubectl` with useful tools.
|:-------:|:---------:|
| `:1.28.4`, `:latest` | [View](variants/1.28.4) |
| `:1.28.4-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.28.4-envsubst-git-jq-kustomize-sops-ssh) |
| `:1.27.7` | [View](variants/1.27.7) |
| `:1.27.7-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.27.7-envsubst-git-jq-kustomize-sops-ssh) |
| `:1.27.8` | [View](variants/1.27.8) |
| `:1.27.8-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.27.8-envsubst-git-jq-kustomize-sops-ssh) |
| `:1.26.10` | [View](variants/1.26.10) |
| `:1.26.10-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.26.10-envsubst-git-jq-kustomize-sops-ssh) |
| `:1.25.15` | [View](variants/1.25.15) |
Expand Down
2 changes: 1 addition & 1 deletion generate/definitions/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"kubectl": {
"versions": [
"1.28.4",
"1.27.7",
"1.27.8",
"1.26.10",
"1.25.15",
"1.24.17",
Expand Down
57 changes: 57 additions & 0 deletions variants/1.27.8-envsubst-git-jq-kustomize-sops-ssh/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.27.8/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" ]
Original file line number Diff line number Diff line change
@@ -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 "$@"
19 changes: 19 additions & 0 deletions variants/1.27.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.27.8/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" ]
10 changes: 10 additions & 0 deletions variants/1.27.8/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"

0 comments on commit 08f9ddc

Please sign in to comment.