fix: various tweaks and cleanups for 1.22
This commit is contained in:
parent
45e95f9bef
commit
bcffd9dd22
4
Makefile
4
Makefile
|
@ -1,6 +1,6 @@
|
||||||
OVERLAY := $(shell pwd)/overlay
|
OVERLAY := $(shell pwd)/overlay
|
||||||
# FILTER := --only 3.15 kubezero --skip aarch64
|
ONLY :=
|
||||||
FILTER := --only 3.15 --skip aarch64
|
FILTER := --only 3.15 $(ONLY) --skip aarch64
|
||||||
STEP := publish
|
STEP := publish
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
Binary file not shown.
|
@ -37,4 +37,8 @@ sed -i -e 's,#!/usr/bin/env python,#!/usr/bin/env python3,' $TARGET/usr/local/bi
|
||||||
chmod +x $TARGET/usr/local/bin/ps_mem.py
|
chmod +x $TARGET/usr/local/bin/ps_mem.py
|
||||||
echo 'Installed ps_mem.py'
|
echo 'Installed ps_mem.py'
|
||||||
|
|
||||||
|
# QoL
|
||||||
|
mv $TARGET/etc/profile.d/color_prompt.sh.disabled $TARGET/etc/profile.d/color_prompt.sh
|
||||||
|
echo 'alias rs="doas bash --login"' > $TARGET/etc/profile.d/alias.sh
|
||||||
|
|
||||||
printf '\n# Zero Down Time config applied'
|
printf '\n# Zero Down Time config applied'
|
||||||
|
|
|
@ -7,22 +7,20 @@ SETUP=/tmp/setup.d
|
||||||
TARGET=/mnt
|
TARGET=/mnt
|
||||||
|
|
||||||
KUBE_VERSION=1.22
|
KUBE_VERSION=1.22
|
||||||
AWS_IAM_VERSION=0.5.6
|
AWS_IAM_VERSION=0.5.7
|
||||||
|
|
||||||
# Enable ZDT repo
|
# Enable ZDT repo
|
||||||
echo "@kubezero https://cdn.zero-downtime.net/alpine/v${VERSION}/kubezero" >> "$TARGET/etc/apk/repositories"
|
echo "@kubezero https://cdn.zero-downtime.net/alpine/v${VERSION}/kubezero" >> "$TARGET/etc/apk/repositories"
|
||||||
install -o root -g root -Dm600 -t $TARGET/etc/apk/keys $SETUP/stefan@zero-downtime.net-61bb6bfb.rsa.pub
|
wget -q -O $TARGET/etc/apk/keys/stefan@zero-downtime.net-61bb6bfb.rsa.pub https://cdn.zero-downtime.net/alpine/stefan@zero-downtime.net-61bb6bfb.rsa.pub
|
||||||
|
|
||||||
apk -U --root "$TARGET" --no-cache add \
|
apk -U --root "$TARGET" --no-cache add \
|
||||||
cri-tools@kubezero \
|
cri-tools@kubezero \
|
||||||
cri-o@kubezero=~$KUBE_VERSION \
|
cri-o@kubezero=~$KUBE_VERSION \
|
||||||
kubelet@kubezero=~$KUBE_VERSION \
|
kubelet@kubezero=~$KUBE_VERSION \
|
||||||
kubectl@kubezero=~$KUBE_VERSION
|
kubectl@kubezero=~$KUBE_VERSION \
|
||||||
|
ecr-credential-provider@kubezero=~$KUBE_VERSION \
|
||||||
# aws-iam-authenticator
|
aws-iam-authenticator@kubezero=~$AWS_IAM_VERSION \
|
||||||
wget -qO $TARGET/usr/local/bin/aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${AWS_IAM_VERSION}/aws-iam-authenticator_${AWS_IAM_VERSION}_linux_amd64
|
aws-neuron-driver@kubezero
|
||||||
chmod +x $TARGET/usr/local/bin/aws-iam-authenticator
|
|
||||||
echo "Installed aws-iam-authenticator binary version $AWS_IAM_VERSION"
|
|
||||||
|
|
||||||
# Pre-load container images
|
# Pre-load container images
|
||||||
# echo 'Pre-loaded Kubernetes control container images'
|
# echo 'Pre-loaded Kubernetes control container images'
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
-----BEGIN PUBLIC KEY-----
|
|
||||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BP/2VTRKfWmGtcJKf10
|
|
||||||
tHrjiOir0BUqxTlYRwOtRv2iSs2aNaxs89sH+ZCNGxao1n+zBijhI2UFbp/nxGO5
|
|
||||||
ftCPZicirASBmFN0XMg94nCt/vz+KCYjU+ASqlM/4uRFk0zf+loknzLgyyGD3SUT
|
|
||||||
tR9NCsOsZWN4sRTGDAAkseCqPOTsG/7c7bDWaEr1Gq2LQdV12KU1OqkSoR+aH9lk
|
|
||||||
xBdKMIgXssHiTQZevgMo515Z5kqaMBsOojpNUNjq7sPHmpKFlJJ93Id0QfH9duPk
|
|
||||||
0oWzT5XJdh6lrilYDAU4Bs4QNVGr1i27dQXRL57m5Gp1u705rwNjUmzwpZtCStwd
|
|
||||||
YwIDAQAB
|
|
||||||
-----END PUBLIC KEY-----
|
|
Loading…
Reference in New Issue