diff --git a/scripts/ack-optimized-os-1.16.sh b/scripts/ack-optimized-os-1.16.sh index 5a506df..7685f46 100644 --- a/scripts/ack-optimized-os-1.16.sh +++ b/scripts/ack-optimized-os-1.16.sh @@ -93,7 +93,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -140,7 +139,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -176,16 +174,14 @@ pull_image() { systemctl start docker sleep 10 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.2 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.2 else systemctl start containerd sleep 10 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.2 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.2 fi } diff --git a/scripts/ack-optimized-os-1.18.sh b/scripts/ack-optimized-os-1.18.sh index 1b9ba26..3c481d5 100755 --- a/scripts/ack-optimized-os-1.18.sh +++ b/scripts/ack-optimized-os-1.18.sh @@ -94,7 +94,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -141,7 +140,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -177,16 +175,14 @@ pull_image() { systemctl start docker sleep 10 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.2 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.2 else systemctl start containerd sleep 10 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.2 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.2 fi } diff --git a/scripts/ack-optimized-os-1.20.sh b/scripts/ack-optimized-os-1.20.sh index 85cee7d..69910a7 100755 --- a/scripts/ack-optimized-os-1.20.sh +++ b/scripts/ack-optimized-os-1.20.sh @@ -91,7 +91,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -138,7 +137,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -215,15 +213,13 @@ pull_image() { sleep 10 docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 else systemctl start containerd sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 fi } diff --git a/scripts/ack-optimized-os-1.22.sh b/scripts/ack-optimized-os-1.22.sh index b24bd57..8eeed35 100644 --- a/scripts/ack-optimized-os-1.22.sh +++ b/scripts/ack-optimized-os-1.22.sh @@ -92,7 +92,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -139,7 +138,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -217,15 +215,13 @@ pull_image() { sleep 10 docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 else systemctl start containerd sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 fi } diff --git a/scripts/ack-optimized-os-1.24.sh b/scripts/ack-optimized-os-1.24.sh index 7728efd..3b15a1e 100644 --- a/scripts/ack-optimized-os-1.24.sh +++ b/scripts/ack-optimized-os-1.24.sh @@ -82,7 +82,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -129,7 +128,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -203,8 +201,7 @@ pull_image() { sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.7.0 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 } update_os_release() { diff --git a/scripts/ack-optimized-os-1.26.sh b/scripts/ack-optimized-os-1.26.sh index 4d42363..15f04b9 100644 --- a/scripts/ack-optimized-os-1.26.sh +++ b/scripts/ack-optimized-os-1.26.sh @@ -131,7 +131,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -178,7 +177,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -214,8 +212,7 @@ pull_image() { sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.7.0 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 } update_os_release() { diff --git a/scripts/ack-optimized-os-all.sh b/scripts/ack-optimized-os-all.sh index c65d678..0936b06 100644 --- a/scripts/ack-optimized-os-all.sh +++ b/scripts/ack-optimized-os-all.sh @@ -157,7 +157,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -204,7 +203,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -241,15 +239,13 @@ pull_image() { sleep 10 docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 else systemctl start containerd sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 fi } @@ -279,6 +275,11 @@ keep_container_data() { fi } +cleanup_userdata() { + rm -rf /var/lib/cloud + +} + cleanup() { rm -rf ./{addon*,docker*,kubernetes*,pkg,run*} } @@ -298,6 +299,7 @@ main() { keep_container_data update_os_release record_k8s_version + cleanup_userdata } main "$@" \ No newline at end of file diff --git a/scripts/ack-optimized-os-anolis-all.sh b/scripts/ack-optimized-os-anolis-all.sh index 9e3c9cb..640a6ae 100644 --- a/scripts/ack-optimized-os-anolis-all.sh +++ b/scripts/ack-optimized-os-anolis-all.sh @@ -157,7 +157,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -204,7 +203,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -241,15 +239,13 @@ pull_image() { sleep 10 docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 else systemctl start containerd sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 fi } diff --git a/scripts/ack-optimized-os-linux3-all.sh b/scripts/ack-optimized-os-linux3-all.sh index fc6c6e9..dc29321 100644 --- a/scripts/ack-optimized-os-linux3-all.sh +++ b/scripts/ack-optimized-os-linux3-all.sh @@ -38,7 +38,6 @@ check_params() { setup_env() { export RUNTIME - export OS="AliyunOS" if [[ "$RUNTIME" = "docker" ]]; then RUNTIME_VERSION=${RUNTIME_VERSION:-19.03.15} @@ -62,7 +61,6 @@ setup_env() { fi } - download_pkg() { if [[ $(echo "${KUBE_VERSION}" | cut -d. -f1) -ge 1 && $(echo "${KUBE_VERSION}" | cut -d. -f2) -ge 20 ]]; then export RELEASE_VERSION=$(echo $KUBE_VERSION | awk -F. '{print $1"."$2}') @@ -160,7 +158,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -191,6 +188,7 @@ libdrm libmpc libpciaccess libpng +libreport-filesystem lm_sensors-libs lsscsi lvm2 @@ -200,12 +198,17 @@ man-db mariadb-libs mdadm microcode_ctl +mpfr +NetworkManager +NetworkManager-libnm +NetworkManager-team +NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix python3 +python3-libs python3-pip python3-setuptools python-decorator @@ -237,15 +240,13 @@ pull_image() { sleep 10 docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 else systemctl start containerd sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 fi } diff --git a/scripts/ack-optimized-os-rhel9-all.sh b/scripts/ack-optimized-os-rhel9-all.sh index 9e3c9cb..f5b78da 100644 --- a/scripts/ack-optimized-os-rhel9-all.sh +++ b/scripts/ack-optimized-os-rhel9-all.sh @@ -157,7 +157,6 @@ geoipupdate gettext gettext-libs glibc-devel -groff-base hunspell hunspell-en hunspell-en-GB @@ -204,7 +203,6 @@ NetworkManager-libnm NetworkManager-team NetworkManager-tui patch -perl-Getopt-Long plymouth plymouth-scripts postfix @@ -241,15 +239,13 @@ pull_image() { sleep 10 docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - docker pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + docker pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 else systemctl start containerd sleep 10 ctr -n k8s.io i pull registry-${REGION}-vpc.ack.aliyuncs.com/acs/kube-proxy:v${KUBE_VERSION} - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/pause:3.5 - ctr -n k8s.io i pull registry-vpc.${REGION}.aliyuncs.com/acs/coredns:1.6.7 + ctr -n k8s.io i registry-${REGION}-vpc.ack.aliyuncs.com/acs/pause:3.5 fi }