Skip to content

Commit 1104355

Browse files
NuruNuru
authored
Add kubectl-1.22, update builder OS versions (#2045)
1 parent 2a783fe commit 1104355

17 files changed

+64
-11
lines changed

‎.github/auto-label.yml

+3
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,9 @@ vendor/kubectl-1.20:
236236
vendor/kubectl-1.21:
237237
- any: ["vendor/kubectl-1.21/**"]
238238
all: ["!bin/**", "!tasks/**"]
239+
vendor/kubectl-1.22:
240+
- any: ["vendor/kubectl-1.22/**"]
241+
all: ["!bin/**", "!tasks/**"]
239242
vendor/kubectl:
240243
- any: ["vendor/kubectl/**"]
241244
all: ["!bin/**", "!tasks/**"]

‎.github/workflows/auto-update-packages.yml

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ jobs:
8686
- kubectl-1.19
8787
- kubectl-1.20
8888
- kubectl-1.21
89+
- kubectl-1.22
8990
- kubectx
9091
- kubens
9192
- kubeval

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,9 @@ Here are some solutions to several common problems that may occur when adding a
357357
[![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)
358358
[![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)
359359
[![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)
360-
[![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)
361-
[![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)
360+
[![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)
361+
[![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)
362+
[![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)
362363
[![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
363364
[![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
364365
[![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

‎apk/Dockerfile-alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Need to use version number so that it gets updated here and triggers a build
2-
FROM alpine:3.13.4
2+
FROM alpine:3.15.0
33

44
ENV LC_ALL=C.UTF-8
55
ENV PS1="(apk) \w \$ "

‎deb/Dockerfile.stable-slim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Need to use version number so that it gets updated here and triggers a build
2-
FROM debian:10.10-slim
2+
FROM debian:11.2-slim
33

44
ENV LC_ALL=C.UTF-8
55
ENV PS1="(deb) \w \$ "

‎docs/badges.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@
7070
[![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)
7171
[![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)
7272
[![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)
73-
[![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)
74-
[![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)
73+
[![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)
74+
[![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)
75+
[![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)
7576
[![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
7677
[![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
7778
[![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

‎docs/targets.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ kubectl-1.16 1.16.15 Production-Grade Container Scheduling and M
7272
kubectl-1.17 1.17.17 Production-Grade Container Scheduling and Management (v1.17)
7373
kubectl-1.18 1.18.20 Production-Grade Container Scheduling and Management (v1.18)
7474
kubectl-1.19 1.19.16 Production-Grade Container Scheduling and Management (v1.19)
75-
kubectl-1.20 1.20.15 Production-Grade Container Scheduling and Management (v1.19)
76-
kubectl-1.21 1.21.9 Production-Grade Container Scheduling and Management (v1.19)
75+
kubectl-1.20 1.20.15 Production-Grade Container Scheduling and Management (v1.20)
76+
kubectl-1.21 1.21.9 Production-Grade Container Scheduling and Management (v1.21)
77+
kubectl-1.22 1.22.6 Production-Grade Container Scheduling and Management (v1.22)
7778
kubectx 0.9.4 Switch faster between clusters and namespaces in kubectl
7879
kubens 0.9.4 Switch faster between clusters and namespaces in kubectl
7980
kubeval 0.16.1 Validate your Kubernetes configuration files, supports multiple Kubernetes versions

‎rpm/Dockerfile.centos8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM centos:centos8
1+
FROM registry.access.redhat.com/ubi8/ubi
22

33
ENV LC_ALL=C.UTF-8
44
ENV PS1="(rpm) \w \$ "

‎vendor/kubectl-1.20/DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Production-Grade Container Scheduling and Management (v1.19)
1+
Production-Grade Container Scheduling and Management (v1.20)

‎vendor/kubectl-1.21/DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Production-Grade Container Scheduling and Management (v1.19)
1+
Production-Grade Container Scheduling and Management (v1.21)

‎vendor/kubectl-1.22/DESCRIPTION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Production-Grade Container Scheduling and Management (v1.22)

‎vendor/kubectl-1.22/LICENSE

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
APACHE-2.0

‎vendor/kubectl-1.22/Makefile

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
export MASTER_PACKAGE_NAME = kubectl
2+
export MAJOR_VERSION = 1.22
3+
export PACKAGE_NAME = $(MASTER_PACKAGE_NAME)-$(MAJOR_VERSION)
4+
export PACKAGE_REPO_NAME = kubernetes
5+
export INSTALL_DIR = /usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin
6+
7+
include ../../tasks/Makefile.vendor_includes
8+
9+
# Package details
10+
export VENDOR = kubernetes
11+
export DOWNLOAD_URL = https://storage.googleapis.com/kubernetes-release/release/v$(PACKAGE_VERSION)/bin/$(OS)/$(ARCH)/kubectl
12+
export APK_BUILD_TEMPLATE = APKBUILD.github-binary
13+
export APKBUILD_DEPENDS += dpkg
14+
export APKBUILD_INSTALL_SCRIPTS = $(PACKAGE_NAME).post-install $(PACKAGE_NAME).post-deinstall
15+
16+
install:
17+
$(call download_binary)
18+
19+
test:
20+
pinned-package-sanity-check "$(PACKAGE_VERSION)" "$(MAJOR_VERSION)"
21+
$(PACKAGE_EXE) version --client | grep -F $(PACKAGE_VERSION)

‎vendor/kubectl-1.22/RELEASE

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0

‎vendor/kubectl-1.22/VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.22.6

‎vendor/kubectl-1.22/kubectl-1.22.post-deinstall

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
# This is an Alpine `deinstall` hook that removes the alternative
3+
MASTER_PACKAGE_NAME=kubectl
4+
MAJOR_VERSION=1.22
5+
PACKAGE_NAME=${MASTER_PACKAGE_NAME}-${MAJOR_VERSION}
6+
INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin
7+
update-alternatives --remove ${PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} --quiet
8+
update-alternatives --remove ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} --quiet
9+
exit 0

‎vendor/kubectl-1.22/kubectl-1.22.post-install

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
# This is an Alpine Package `post-install` hook that links
3+
# an alternative from `/usr/share/${PACKAGE_NAME}/$version/bin` into `/usr/bin/`
4+
MASTER_PACKAGE_NAME=kubectl
5+
MAJOR_VERSION=1.22
6+
PACKAGE_NAME=${MASTER_PACKAGE_NAME}-${MAJOR_VERSION}
7+
INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin
8+
9+
mkdir -p ${INSTALL_DIR}
10+
update-alternatives --install /usr/bin/${PACKAGE_NAME} ${PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} 1
11+
update-alternatives --install /usr/bin/${MASTER_PACKAGE_NAME} ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} 22
12+
exit 0

0 commit comments

Comments
 (0)