-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #181 from theohbrothers/enhancement/bump-kubectl-1…
….29-variants-to-1.29.12 Enhancement: Bump kubectl 1.29 variants to 1.29.12
- Loading branch information
Showing
7 changed files
with
139 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| "versions": [ | ||
| "1.31.4", | ||
| "1.30.8", | ||
| "1.29.11", | ||
| "1.29.12", | ||
| "1.28.15", | ||
| "1.27.16", | ||
| "1.26.15", | ||
|
|
||
60 changes: 60 additions & 0 deletions
60
variants/1.29.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| 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 set -eux; \ | ||
| BIN_URL=https://dl.k8s.io/release/v1.29.12/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.3/sops-v3.7.3.linux > /usr/local/bin/sops; \ | ||
| chmod +x /usr/local/bin/sops; \ | ||
| sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \ | ||
| sops --version | ||
|
|
||
| RUN apk add --no-cache gnupg | ||
|
|
||
| RUN apk add --no-cache openssh-client | ||
|
|
||
| RUN apk add --no-cache yq | ||
|
|
||
| COPY docker-entrypoint.sh /docker-entrypoint.sh | ||
| RUN chmod +x /docker-entrypoint.sh | ||
|
|
||
| ENTRYPOINT [ "/docker-entrypoint.sh" ] |
10 changes: 10 additions & 0 deletions
10
variants/1.29.12-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| 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 set -eux; \ | ||
| BIN_URL=https://dl.k8s.io/release/v1.29.12/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" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 "$@" |