Skip to content

Commit

Permalink
Merge pull request #59 from theohbrothers/enhancement/bump-v1.23.x-va…
Browse files Browse the repository at this point in the history
…riants-to-v1.23.17

Enhancement: Bump `v1.23.x` variants to `v1.23.17`
  • Loading branch information
leojonathanoh authored Apr 12, 2023
2 parents cad0ba4 + f32e6ea commit 474be7e
Show file tree
Hide file tree
Showing 7 changed files with 112 additions and 16 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci-master-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,10 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
build-v1-23-15-alpine-3-8:
build-v1-23-17-alpine-3-8:
runs-on: ubuntu-latest
env:
VARIANT: v1.23.15-alpine-3.8
VARIANT: v1.23.17-alpine-3.8
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -1068,7 +1068,7 @@ jobs:
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
with:
context: variants/v1.23.15-alpine-3.8
context: variants/v1.23.17-alpine-3.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: false
tags: |
Expand All @@ -1082,7 +1082,7 @@ jobs:
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
with:
context: variants/v1.23.15-alpine-3.8
context: variants/v1.23.17-alpine-3.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: true
tags: |
Expand All @@ -1095,7 +1095,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
with:
context: variants/v1.23.15-alpine-3.8
context: variants/v1.23.17-alpine-3.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: true
tags: |
Expand All @@ -1113,10 +1113,10 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
build-v1-23-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
build-v1-23-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
runs-on: ubuntu-latest
env:
VARIANT: v1.23.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
VARIANT: v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -1188,7 +1188,7 @@ jobs:
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
with:
context: variants/v1.23.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
context: variants/v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: false
tags: |
Expand All @@ -1202,7 +1202,7 @@ jobs:
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
with:
context: variants/v1.23.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
context: variants/v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: true
tags: |
Expand All @@ -1215,7 +1215,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
with:
context: variants/v1.23.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
context: variants/v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
push: true
tags: |
Expand Down Expand Up @@ -3394,7 +3394,7 @@ jobs:
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
update-draft-release:
needs: [build-v1-27-0-alpine-3-8, build-v1-27-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-26-3-alpine-3-8, build-v1-26-3-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-25-7-alpine-3-8, build-v1-25-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-24-11-alpine-3-8, build-v1-24-11-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-23-15-alpine-3-8, build-v1-23-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-22-17-alpine-3-8, build-v1-22-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-14-alpine-3-8, build-v1-21-14-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-15-alpine-3-8, build-v1-20-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-16-alpine-3-8, build-v1-19-16-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-20-alpine-3-8, build-v1-18-20-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8]
needs: [build-v1-27-0-alpine-3-8, build-v1-27-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-26-3-alpine-3-8, build-v1-26-3-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-25-7-alpine-3-8, build-v1-25-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-24-11-alpine-3-8, build-v1-24-11-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-23-17-alpine-3-8, build-v1-23-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-22-17-alpine-3-8, build-v1-22-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-14-alpine-3-8, build-v1-21-14-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-15-alpine-3-8, build-v1-20-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-16-alpine-3-8, build-v1-19-16-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-20-alpine-3-8, build-v1-18-20-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8]
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
steps:
Expand All @@ -3407,7 +3407,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-draft-release:
needs: [build-v1-27-0-alpine-3-8, build-v1-27-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-26-3-alpine-3-8, build-v1-26-3-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-25-7-alpine-3-8, build-v1-25-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-24-11-alpine-3-8, build-v1-24-11-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-23-15-alpine-3-8, build-v1-23-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-22-17-alpine-3-8, build-v1-22-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-14-alpine-3-8, build-v1-21-14-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-15-alpine-3-8, build-v1-20-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-16-alpine-3-8, build-v1-19-16-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-20-alpine-3-8, build-v1-18-20-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8]
needs: [build-v1-27-0-alpine-3-8, build-v1-27-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-26-3-alpine-3-8, build-v1-26-3-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-25-7-alpine-3-8, build-v1-25-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-24-11-alpine-3-8, build-v1-24-11-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-23-17-alpine-3-8, build-v1-23-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-22-17-alpine-3-8, build-v1-22-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-14-alpine-3-8, build-v1-21-14-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-15-alpine-3-8, build-v1-20-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-16-alpine-3-8, build-v1-19-16-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-20-alpine-3-8, build-v1-18-20-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8]
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
steps:
Expand All @@ -3422,7 +3422,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

update-dockerhub-description:
needs: [build-v1-27-0-alpine-3-8, build-v1-27-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-26-3-alpine-3-8, build-v1-26-3-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-25-7-alpine-3-8, build-v1-25-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-24-11-alpine-3-8, build-v1-24-11-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-23-15-alpine-3-8, build-v1-23-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-22-17-alpine-3-8, build-v1-22-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-14-alpine-3-8, build-v1-21-14-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-15-alpine-3-8, build-v1-20-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-16-alpine-3-8, build-v1-19-16-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-20-alpine-3-8, build-v1-18-20-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8]
needs: [build-v1-27-0-alpine-3-8, build-v1-27-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-26-3-alpine-3-8, build-v1-26-3-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-25-7-alpine-3-8, build-v1-25-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-24-11-alpine-3-8, build-v1-24-11-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-23-17-alpine-3-8, build-v1-23-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-22-17-alpine-3-8, build-v1-22-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-14-alpine-3-8, build-v1-21-14-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-15-alpine-3-8, build-v1-20-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-16-alpine-3-8, build-v1-19-16-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-20-alpine-3-8, build-v1-18-20-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8]
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Dockerized `kubectl` with useful tools.
| `:v1.25.7-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.25.7-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8) |
| `:v1.24.11-alpine-3.8` | [View](variants/v1.24.11-alpine-3.8) |
| `:v1.24.11-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.24.11-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8) |
| `:v1.23.15-alpine-3.8` | [View](variants/v1.23.15-alpine-3.8) |
| `:v1.23.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.23.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8) |
| `:v1.23.17-alpine-3.8` | [View](variants/v1.23.17-alpine-3.8) |
| `:v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8) |
| `:v1.22.17-alpine-3.8` | [View](variants/v1.22.17-alpine-3.8) |
| `:v1.22.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.22.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8) |
| `:v1.21.14-alpine-3.8` | [View](variants/v1.21.14-alpine-3.8) |
Expand Down
2 changes: 1 addition & 1 deletion generate/definitions/VARIANTS.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $local:VARIANTS_PACKAGE_VERSIONS = @(
'v1.26.3'
'v1.25.7'
'v1.24.11'
'v1.23.15'
'v1.23.17'
'v1.22.17'
'v1.21.14'
'v1.20.15'
Expand Down
19 changes: 19 additions & 0 deletions variants/v1.23.17-alpine-3.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM alpine:3.8
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.23.17/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/v1.23.17-alpine-3.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 "$@"
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
FROM alpine:3.8
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.23.17/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 "$@"

0 comments on commit 474be7e

Please sign in to comment.