diff --git a/.github/workflows/image-build-push.yaml b/.github/workflows/image-build-push.yaml index 52f9c4b..7b86606 100644 --- a/.github/workflows/image-build-push.yaml +++ b/.github/workflows/image-build-push.yaml @@ -62,7 +62,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/ppc64le,linux/s390x build-args: | - KUBE_VERSION=1.23.0 - HELM_VERSION=3.7.2 + KUBE_VERSION=1.23.2 + HELM_VERSION=3.8.0 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index f618a9d..a27a0bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,8 @@ ARG HELM_VERSION ARG TARGETOS ARG TARGETARCH -RUN apk add --no-cache ca-certificates bash git openssh curl gettext jq bind-tools \ +RUN apk -U upgrade \ + && apk add --no-cache ca-certificates bash git openssh curl gettext jq bind-tools \ && wget -q https://storage.googleapis.com/kubernetes-release/release/v${KUBE_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl -O /usr/local/bin/kubectl \ && wget -q https://get.helm.sh/helm-v${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz -O - | tar -xzO ${TARGETOS}-${TARGETARCH}/helm > /usr/local/bin/helm \ && chmod +x /usr/local/bin/helm /usr/local/bin/kubectl \ diff --git a/Makefile b/Makefile index db61a11..5e30917 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,11 @@ DOCKER_TAG ?= `git rev-parse --abbrev-ref HEAD` # Note: Latest version of kubectl may be found at: # https://github.com/kubernetes/kubernetes/releases -KUBE_VERSION = "1.23.0" +KUBE_VERSION = "1.23.2" # Note: Latest version of helm may be found at # https://github.com/kubernetes/helm/releases -HELM_VERSION = "3.7.2" +HELM_VERSION = "3.8.0" docker_build: @docker buildx build \ diff --git a/README.md b/README.md index 06cb8de..8bb1db9 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Supported tags and release links +* [3.8.0](https://github.com/dtzar/helm-kubectl/releases/tag/3.8.0) - helm v3.8.0, kubectl v1.23.2, alpine 3.15 * [3.7.2](https://github.com/dtzar/helm-kubectl/releases/tag/3.7.2) - helm v3.7.2, kubectl v1.23.0, alpine 3.15 * [3.7.1](https://github.com/dtzar/helm-kubectl/releases/tag/3.7.1) - helm v3.7.1, kubectl v1.22.2, alpine 3.14 * [3.7.0](https://github.com/dtzar/helm-kubectl/releases/tag/3.7.0) - helm v3.7.0, kubectl v1.22.2, alpine 3.14 @@ -39,7 +40,7 @@ Supported tags and release links ## Overview -This lightweight alpine docker image provides kubectl and helm binaries for working with a Kubernetes cluster. A local configured kubectl is a prerequisite to use helm per [helm documentation](https://github.com/kubernetes/helm/blob/master/docs/quickstart.md). This image is useful for general helm administration such as deploying helm charts and managing releases. It is also perfect for any automated deployment pipeline needing to use helm which supports docker images such as [Concourse CI](https://concourse.ci), [Jenkins on Kubernetes](https://kubeapps.com/charts/stable/jenkins), [Travis CI](https://docs.travis-ci.com/user/docker/), and [Circle CI](https://circleci.com/integrations/docker/). Having bash installed allows for better support for troubleshooting by being able to exec / terminal in and run desired shell scripts. Git installed allows installation of [helm plugins](https://github.com/kubernetes/helm/blob/master/docs/plugins.md). +This lightweight alpine docker image provides kubectl and helm binaries for working with a Kubernetes cluster. A local configured kubectl is a prerequisite to use helm per [helm documentation](https://github.com/kubernetes/helm/blob/master/docs/quickstart.md). This image is useful for general helm administration such as deploying helm charts and managing releases. It is also perfect for any automated deployment pipeline needing to use helm which supports docker images such as [Concourse CI](https://concourse.ci), [Jenkins on Kubernetes](https://kubeapps.com/charts/stable/jenkins), [Travis CI](https://docs.travis-ci.com/user/docker/), and [Circle CI](https://circleci.com/integrations/docker/). Having bash installed allows for better support for troubleshooting by being able to exec / terminal in and run desired shell scripts. Git installed allows installation of [helm plugins](https://github.com/kubernetes/helm/blob/master/docs/plugins.md). If it is desired to only use kubectl and have kubectl as the entry command (versus this image as bash entry command), I recommend checking out this image instead: [lachlanevenson/kubectl](https://hub.docker.com/r/lachlanevenson/k8s-kubectl/)