diff --git a/.github/auto-label.yml b/.github/auto-label.yml index 4fdb211967..db5b057be1 100644 --- a/.github/auto-label.yml +++ b/.github/auto-label.yml @@ -236,6 +236,9 @@ vendor/kubectl-1.20: vendor/kubectl-1.21: - any: ["vendor/kubectl-1.21/**"] all: ["!bin/**", "!tasks/**"] +vendor/kubectl-1.22: +- any: ["vendor/kubectl-1.22/**"] + all: ["!bin/**", "!tasks/**"] vendor/kubectl: - any: ["vendor/kubectl/**"] all: ["!bin/**", "!tasks/**"] diff --git a/.github/workflows/auto-update-packages.yml b/.github/workflows/auto-update-packages.yml index be7a08f809..650d266e27 100644 --- a/.github/workflows/auto-update-packages.yml +++ b/.github/workflows/auto-update-packages.yml @@ -86,6 +86,7 @@ jobs: - kubectl-1.19 - kubectl-1.20 - kubectl-1.21 + - kubectl-1.22 - kubectx - kubens - kubeval diff --git a/README.md b/README.md index 069dca8947..8b0ab01876 100644 --- a/README.md +++ b/README.md @@ -357,8 +357,9 @@ Here are some solutions to several common problems that may occur when adding a [![kubectl-1.17](https://github.com/cloudposse/packages/workflows/kubectl-1.17/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.17) | 1.17.17 | Production-Grade Container Scheduling and Management (v1.17) [![kubectl-1.18](https://github.com/cloudposse/packages/workflows/kubectl-1.18/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.18) | 1.18.20 | Production-Grade Container Scheduling and Management (v1.18) [![kubectl-1.19](https://github.com/cloudposse/packages/workflows/kubectl-1.19/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.19) | 1.19.16 | Production-Grade Container Scheduling and Management (v1.19) -[![kubectl-1.20](https://github.com/cloudposse/packages/workflows/kubectl-1.20/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.20) | 1.20.15 | Production-Grade Container Scheduling and Management (v1.19) -[![kubectl-1.21](https://github.com/cloudposse/packages/workflows/kubectl-1.21/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.21) | 1.21.9 | Production-Grade Container Scheduling and Management (v1.19) +[![kubectl-1.20](https://github.com/cloudposse/packages/workflows/kubectl-1.20/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.20) | 1.20.15 | Production-Grade Container Scheduling and Management (v1.20) +[![kubectl-1.21](https://github.com/cloudposse/packages/workflows/kubectl-1.21/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.21) | 1.21.9 | Production-Grade Container Scheduling and Management (v1.21) +[![kubectl-1.22](https://github.com/cloudposse/packages/workflows/kubectl-1.22/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.22) | 1.22.6 | Production-Grade Container Scheduling and Management (v1.22) [![kubectx](https://github.com/cloudposse/packages/workflows/kubectx/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectx) | 0.9.4 | Switch faster between clusters and namespaces in kubectl [![kubens](https://github.com/cloudposse/packages/workflows/kubens/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubens) | 0.9.4 | Switch faster between clusters and namespaces in kubectl [![kubeval](https://github.com/cloudposse/packages/workflows/kubeval/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubeval) | 0.16.1 | Validate your Kubernetes configuration files, supports multiple Kubernetes versions diff --git a/apk/Dockerfile-alpine b/apk/Dockerfile-alpine index 06afefc46d..790866b767 100644 --- a/apk/Dockerfile-alpine +++ b/apk/Dockerfile-alpine @@ -1,5 +1,5 @@ # Need to use version number so that it gets updated here and triggers a build -FROM alpine:3.13.4 +FROM alpine:3.15.0 ENV LC_ALL=C.UTF-8 ENV PS1="(apk) \w \$ " diff --git a/deb/Dockerfile.stable-slim b/deb/Dockerfile.stable-slim index 04627087e7..748671e637 100644 --- a/deb/Dockerfile.stable-slim +++ b/deb/Dockerfile.stable-slim @@ -1,5 +1,5 @@ # Need to use version number so that it gets updated here and triggers a build -FROM debian:10.10-slim +FROM debian:11.2-slim ENV LC_ALL=C.UTF-8 ENV PS1="(deb) \w \$ " diff --git a/docs/badges.md b/docs/badges.md index a47d88f8ca..6723c165fb 100644 --- a/docs/badges.md +++ b/docs/badges.md @@ -70,8 +70,9 @@ [![kubectl-1.17](https://github.com/cloudposse/packages/workflows/kubectl-1.17/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.17) | 1.17.17 | Production-Grade Container Scheduling and Management (v1.17) [![kubectl-1.18](https://github.com/cloudposse/packages/workflows/kubectl-1.18/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.18) | 1.18.20 | Production-Grade Container Scheduling and Management (v1.18) [![kubectl-1.19](https://github.com/cloudposse/packages/workflows/kubectl-1.19/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.19) | 1.19.16 | Production-Grade Container Scheduling and Management (v1.19) -[![kubectl-1.20](https://github.com/cloudposse/packages/workflows/kubectl-1.20/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.20) | 1.20.15 | Production-Grade Container Scheduling and Management (v1.19) -[![kubectl-1.21](https://github.com/cloudposse/packages/workflows/kubectl-1.21/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.21) | 1.21.9 | Production-Grade Container Scheduling and Management (v1.19) +[![kubectl-1.20](https://github.com/cloudposse/packages/workflows/kubectl-1.20/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.20) | 1.20.15 | Production-Grade Container Scheduling and Management (v1.20) +[![kubectl-1.21](https://github.com/cloudposse/packages/workflows/kubectl-1.21/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.21) | 1.21.9 | Production-Grade Container Scheduling and Management (v1.21) +[![kubectl-1.22](https://github.com/cloudposse/packages/workflows/kubectl-1.22/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectl-1.22) | 1.22.6 | Production-Grade Container Scheduling and Management (v1.22) [![kubectx](https://github.com/cloudposse/packages/workflows/kubectx/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubectx) | 0.9.4 | Switch faster between clusters and namespaces in kubectl [![kubens](https://github.com/cloudposse/packages/workflows/kubens/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubens) | 0.9.4 | Switch faster between clusters and namespaces in kubectl [![kubeval](https://github.com/cloudposse/packages/workflows/kubeval/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Akubeval) | 0.16.1 | Validate your Kubernetes configuration files, supports multiple Kubernetes versions diff --git a/docs/targets.md b/docs/targets.md index 3c308f5d9c..6e6df29beb 100644 --- a/docs/targets.md +++ b/docs/targets.md @@ -72,8 +72,9 @@ kubectl-1.16 1.16.15 Production-Grade Container Scheduling and M kubectl-1.17 1.17.17 Production-Grade Container Scheduling and Management (v1.17) kubectl-1.18 1.18.20 Production-Grade Container Scheduling and Management (v1.18) kubectl-1.19 1.19.16 Production-Grade Container Scheduling and Management (v1.19) -kubectl-1.20 1.20.15 Production-Grade Container Scheduling and Management (v1.19) -kubectl-1.21 1.21.9 Production-Grade Container Scheduling and Management (v1.19) +kubectl-1.20 1.20.15 Production-Grade Container Scheduling and Management (v1.20) +kubectl-1.21 1.21.9 Production-Grade Container Scheduling and Management (v1.21) +kubectl-1.22 1.22.6 Production-Grade Container Scheduling and Management (v1.22) kubectx 0.9.4 Switch faster between clusters and namespaces in kubectl kubens 0.9.4 Switch faster between clusters and namespaces in kubectl kubeval 0.16.1 Validate your Kubernetes configuration files, supports multiple Kubernetes versions diff --git a/rpm/Dockerfile.centos8 b/rpm/Dockerfile.centos8 index ac062386c9..3d7173e8c2 100644 --- a/rpm/Dockerfile.centos8 +++ b/rpm/Dockerfile.centos8 @@ -1,4 +1,4 @@ -FROM centos:centos8 +FROM registry.access.redhat.com/ubi8/ubi ENV LC_ALL=C.UTF-8 ENV PS1="(rpm) \w \$ " diff --git a/vendor/kubectl-1.20/DESCRIPTION b/vendor/kubectl-1.20/DESCRIPTION index a91a5ed4e0..99f07709d7 100644 --- a/vendor/kubectl-1.20/DESCRIPTION +++ b/vendor/kubectl-1.20/DESCRIPTION @@ -1 +1 @@ -Production-Grade Container Scheduling and Management (v1.19) +Production-Grade Container Scheduling and Management (v1.20) diff --git a/vendor/kubectl-1.21/DESCRIPTION b/vendor/kubectl-1.21/DESCRIPTION index a91a5ed4e0..b673be3d96 100644 --- a/vendor/kubectl-1.21/DESCRIPTION +++ b/vendor/kubectl-1.21/DESCRIPTION @@ -1 +1 @@ -Production-Grade Container Scheduling and Management (v1.19) +Production-Grade Container Scheduling and Management (v1.21) diff --git a/vendor/kubectl-1.22/DESCRIPTION b/vendor/kubectl-1.22/DESCRIPTION new file mode 100644 index 0000000000..e16f3f58f0 --- /dev/null +++ b/vendor/kubectl-1.22/DESCRIPTION @@ -0,0 +1 @@ +Production-Grade Container Scheduling and Management (v1.22) diff --git a/vendor/kubectl-1.22/LICENSE b/vendor/kubectl-1.22/LICENSE new file mode 100644 index 0000000000..7a85ddd4e2 --- /dev/null +++ b/vendor/kubectl-1.22/LICENSE @@ -0,0 +1 @@ +APACHE-2.0 diff --git a/vendor/kubectl-1.22/Makefile b/vendor/kubectl-1.22/Makefile new file mode 100644 index 0000000000..2f06d4660c --- /dev/null +++ b/vendor/kubectl-1.22/Makefile @@ -0,0 +1,21 @@ +export MASTER_PACKAGE_NAME = kubectl +export MAJOR_VERSION = 1.22 +export PACKAGE_NAME = $(MASTER_PACKAGE_NAME)-$(MAJOR_VERSION) +export PACKAGE_REPO_NAME = kubernetes +export INSTALL_DIR = /usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin + +include ../../tasks/Makefile.vendor_includes + +# Package details +export VENDOR = kubernetes +export DOWNLOAD_URL = https://storage.googleapis.com/kubernetes-release/release/v$(PACKAGE_VERSION)/bin/$(OS)/$(ARCH)/kubectl +export APK_BUILD_TEMPLATE = APKBUILD.github-binary +export APKBUILD_DEPENDS += dpkg +export APKBUILD_INSTALL_SCRIPTS = $(PACKAGE_NAME).post-install $(PACKAGE_NAME).post-deinstall + +install: + $(call download_binary) + +test: + pinned-package-sanity-check "$(PACKAGE_VERSION)" "$(MAJOR_VERSION)" + $(PACKAGE_EXE) version --client | grep -F $(PACKAGE_VERSION) diff --git a/vendor/kubectl-1.22/RELEASE b/vendor/kubectl-1.22/RELEASE new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/vendor/kubectl-1.22/RELEASE @@ -0,0 +1 @@ +0 diff --git a/vendor/kubectl-1.22/VERSION b/vendor/kubectl-1.22/VERSION new file mode 100644 index 0000000000..013173af5e --- /dev/null +++ b/vendor/kubectl-1.22/VERSION @@ -0,0 +1 @@ +1.22.6 diff --git a/vendor/kubectl-1.22/kubectl-1.22.post-deinstall b/vendor/kubectl-1.22/kubectl-1.22.post-deinstall new file mode 100755 index 0000000000..641707c952 --- /dev/null +++ b/vendor/kubectl-1.22/kubectl-1.22.post-deinstall @@ -0,0 +1,9 @@ +#!/bin/sh +# This is an Alpine `deinstall` hook that removes the alternative +MASTER_PACKAGE_NAME=kubectl +MAJOR_VERSION=1.22 +PACKAGE_NAME=${MASTER_PACKAGE_NAME}-${MAJOR_VERSION} +INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin +update-alternatives --remove ${PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} --quiet +update-alternatives --remove ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} --quiet +exit 0 diff --git a/vendor/kubectl-1.22/kubectl-1.22.post-install b/vendor/kubectl-1.22/kubectl-1.22.post-install new file mode 100755 index 0000000000..b840015641 --- /dev/null +++ b/vendor/kubectl-1.22/kubectl-1.22.post-install @@ -0,0 +1,12 @@ +#!/bin/sh +# This is an Alpine Package `post-install` hook that links +# an alternative from `/usr/share/${PACKAGE_NAME}/$version/bin` into `/usr/bin/` +MASTER_PACKAGE_NAME=kubectl +MAJOR_VERSION=1.22 +PACKAGE_NAME=${MASTER_PACKAGE_NAME}-${MAJOR_VERSION} +INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin + +mkdir -p ${INSTALL_DIR} +update-alternatives --install /usr/bin/${PACKAGE_NAME} ${PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} 1 +update-alternatives --install /usr/bin/${MASTER_PACKAGE_NAME} ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} 22 +exit 0