diff --git a/cleanup_amis.sh b/cleanup_amis.sh index 6d4cae6..672befd 100755 --- a/cleanup_amis.sh +++ b/cleanup_amis.sh @@ -6,7 +6,7 @@ read #TAG_FILTER="Name=tag:project,Values=zdt-alpine" TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-minimal-r1" -#TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.9-r0" +#TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r0" #for r in $(aws ec2 describe-regions --query "Regions[].{Name:RegionName}" --output text); do for r in ap-southeast-2 ca-central-1 eu-central-1 us-east-1 us-west-1 us-west-2; do diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/common-packages.conf index 75bf4b6..e97146e 100644 --- a/overlay/zdt/configs/common-packages.conf +++ b/overlay/zdt/configs/common-packages.conf @@ -13,9 +13,10 @@ nvme-cli = true xfsprogs = true dhclient = true monit = true -prometheus-node-exporter = true -prometheus-wireguard-exporter = true -tiny-cloud = edge -tiny-cloud-openrc = edge -tiny-cloud-network = edge -tiny-cloud-aws = edge +tiny-cloud = main-edge +tiny-cloud-openrc = main-edge +tiny-cloud-network = main-edge +tiny-cloud-aws = main-edge +conmon = community-edge +prometheus-node-exporter = true +prometheus-wireguard-exporter = true diff --git a/overlay/zdt/configs/common.conf b/overlay/zdt/configs/common.conf index 74ae5e1..2315a42 100644 --- a/overlay/zdt/configs/common.conf +++ b/overlay/zdt/configs/common.conf @@ -5,7 +5,8 @@ packages { include required("common-packages.conf") } services { include required("common-services.conf") } repos { - "https://dl-cdn.alpinelinux.org/alpine/edge/main" = edge + "https://dl-cdn.alpinelinux.org/alpine/edge/main" = main-edge + "https://dl-cdn.alpinelinux.org/alpine/edge/community" = community-edge } WHEN { diff --git a/overlay/zdt/configs/kubezero.conf b/overlay/zdt/configs/kubezero.conf index d228c3c..3b06187 100644 --- a/overlay/zdt/configs/kubezero.conf +++ b/overlay/zdt/configs/kubezero.conf @@ -3,7 +3,7 @@ include required("common.conf") description = [ "- https://kubezero.com" ] -name = [ kubezero-1.23.9 ] +name = [ kubezero-1.23.10 ] size = 2G WHEN { diff --git a/overlay/zdt/scripts/setup-common b/overlay/zdt/scripts/setup-common index c552b0a..4fdd039 100755 --- a/overlay/zdt/scripts/setup-common +++ b/overlay/zdt/scripts/setup-common @@ -31,6 +31,7 @@ sed -i -e "s/^[\s#]*rc_cgroup_mode=.*/rc_cgroup_mode=\"unified\"/" $TARGET/etc/r # Setup syslog-ng json logging cp $SETUP/syslog-ng.conf $TARGET/etc/syslog-ng/syslog-ng.conf cp $SETUP/syslog-ng.logrotate.conf $TARGET/etc/logrotate.d/syslog-ng +mkdir -p $TARGET/var/log/containers echo 'syslog set to json logging' # Change logrotate to run hourly rather than daily diff --git a/overlay/zdt/scripts/setup-kubernetes b/overlay/zdt/scripts/setup-kubernetes index 1bb41c4..6ac34a6 100755 --- a/overlay/zdt/scripts/setup-kubernetes +++ b/overlay/zdt/scripts/setup-kubernetes @@ -17,8 +17,7 @@ apk -U --root "$TARGET" --no-cache add \ ecr-credential-provider@kubezero=~$KUBE_VERSION \ aws-iam-authenticator@kubezero=~$AWS_IAM_VERSION \ aws-neuron-driver@kubezero \ - nvidia-open-gpu@kubezero \ - conmon@kubezero # temp until conmon gets fixed in edge + nvidia-open-gpu@kubezero # Pre-load container images # echo 'Pre-loaded Kubernetes control container images'