fix image name

Author: Nick-0314

.github/workflows/build.yaml

@@ -36,11 +36,11 @@ jobs:
           - name: centos-8
             image_name: os-packages-centos8
             package_name: kubeplay
-          - name: fedora-33
-            image_name: os-packages-fedora33
+          - name: fedora-35
+            image_name: os-packages-fedora35
             package_name: kubeplay
-          - name: fedora-34
-            image_name: os-packages-fedora34
+          - name: fedora-36
+            image_name: os-packages-fedora36
             package_name: kubeplay
           - name: debian-9
             image_name: os-packages-debian9
@@ -54,6 +54,9 @@ jobs:
           - name: ubuntu-2004
             image_name: os-packages-ubuntu2004
             package_name: kubeplay
+          - name: ubuntu-2204
+            image_name: os-packages-ubuntu2204
+            package_name: kubeplay
 
     steps:
       - name: Checkout

.github/workflows/pull_request_test_build.yaml

@@ -42,10 +42,10 @@ jobs:
             image_name: os-packages-centos8
             package_name: kubeplay
           - name: fedora-33
-            image_name: os-packages-fedora33
+            image_name: os-packages-fedora35
             package_name: kubeplay
           - name: fedora-34
-            image_name: os-packages-fedora34
+            image_name: os-packages-fedora36
             package_name: kubeplay
           - name: debian-9
             image_name: os-packages-debian9
@@ -59,6 +59,9 @@ jobs:
           - name: ubuntu-2004
             image_name: os-packages-ubuntu2004
             package_name: kubeplay
+          - name: ubuntu-2204
+            image_name: os-packages-ubuntu2204
+            package_name: kubeplay
 
     steps:
       - name: Checkout

.github/workflows/release.yaml

@@ -36,11 +36,11 @@ jobs:
           - name: centos-8
             image_name: os-packages-centos8
             package_name: kubeplay
-          - name: fedora-33
-            image_name: os-packages-fedora33
+          - name: fedora-35
+            image_name: os-packages-fedora35
             package_name: kubeplay
-          - name: fedora-34
-            image_name: os-packages-fedora34
+          - name: fedora-36
+            image_name: os-packages-fedora36
             package_name: kubeplay
           - name: debian-9
             image_name: os-packages-debian9
@@ -54,6 +54,9 @@ jobs:
           - name: ubuntu-2004
             image_name: os-packages-ubuntu2004
             package_name: kubeplay
+          - name: ubuntu-2204
+            image_name: os-packages-ubuntu2204
+            package_name: kubeplay
 
     steps:
       - name: Checkout

config/containerd.toml

@@ -16,8 +16,10 @@ oom_score = 0
 
 [plugins]
   [plugins."io.containerd.grpc.v1.cri"]
-    sandbox_image = "REGISTRY_DOMAIN/library/pause:3.3"
+    sandbox_image = "REGISTRY_DOMAIN/library/pause:3.7"
     max_container_log_line_size = -1
+    enable_unprivileged_ports = false
+    enable_unprivileged_icmp = false
     [plugins."io.containerd.grpc.v1.cri".containerd]
       default_runtime_name = "runc"
       snapshotter = "overlayfs"
@@ -26,9 +28,12 @@ oom_score = 0
           runtime_type = "io.containerd.runc.v2"
           runtime_engine = ""
           runtime_root = ""
+          base_runtime_spec = "/etc/containerd/cri-base.json"
+
           [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
             systemdCgroup = true
     [plugins."io.containerd.grpc.v1.cri".registry]
       [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
         [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
-          endpoint = ["https://registry-1.docker.io"]
+          endpoint = ["https://registry-1.docker.io"]
+

config/cri-base.json

@@ -0,0 +1 @@
+{"ociVersion": "1.0.2-dev", "process": {"user": {"uid": 0, "gid": 0}, "cwd": "/", "capabilities": {"bounding": ["CAP_CHOWN", "CAP_DAC_OVERRIDE", "CAP_FSETID", "CAP_FOWNER", "CAP_MKNOD", "CAP_NET_RAW", "CAP_SETGID", "CAP_SETUID", "CAP_SETFCAP", "CAP_SETPCAP", "CAP_NET_BIND_SERVICE", "CAP_SYS_CHROOT", "CAP_KILL", "CAP_AUDIT_WRITE"], "effective": ["CAP_CHOWN", "CAP_DAC_OVERRIDE", "CAP_FSETID", "CAP_FOWNER", "CAP_MKNOD", "CAP_NET_RAW", "CAP_SETGID", "CAP_SETUID", "CAP_SETFCAP", "CAP_SETPCAP", "CAP_NET_BIND_SERVICE", "CAP_SYS_CHROOT", "CAP_KILL", "CAP_AUDIT_WRITE"], "permitted": ["CAP_CHOWN", "CAP_DAC_OVERRIDE", "CAP_FSETID", "CAP_FOWNER", "CAP_MKNOD", "CAP_NET_RAW", "CAP_SETGID", "CAP_SETUID", "CAP_SETFCAP", "CAP_SETPCAP", "CAP_NET_BIND_SERVICE", "CAP_SYS_CHROOT", "CAP_KILL", "CAP_AUDIT_WRITE"]}, "rlimits": [{"type": "RLIMIT_NOFILE", "hard": 65535, "soft": 65535}], "noNewPrivileges": true}, "root": {"path": "rootfs"}, "mounts": [{"destination": "/proc", "type": "proc", "source": "proc", "options": ["nosuid", "noexec", "nodev"]}, {"destination": "/dev", "type": "tmpfs", "source": "tmpfs", "options": ["nosuid", "strictatime", "mode=755", "size=65536k"]}, {"destination": "/dev/pts", "type": "devpts", "source": "devpts", "options": ["nosuid", "noexec", "newinstance", "ptmxmode=0666", "mode=0620", "gid=5"]}, {"destination": "/dev/shm", "type": "tmpfs", "source": "shm", "options": ["nosuid", "noexec", "nodev", "mode=1777", "size=65536k"]}, {"destination": "/dev/mqueue", "type": "mqueue", "source": "mqueue", "options": ["nosuid", "noexec", "nodev"]}, {"destination": "/sys", "type": "sysfs", "source": "sysfs", "options": ["nosuid", "noexec", "nodev", "ro"]}, {"destination": "/run", "type": "tmpfs", "source": "tmpfs", "options": ["nosuid", "strictatime", "mode=755", "size=65536k"]}], "linux": {"resources": {"devices": [{"allow": false, "access": "rwm"}]}, "cgroupsPath": "/default", "namespaces": [{"type": "pid"}, {"type": "ipc"}, {"type": "uts"}, {"type": "mount"}, {"type": "network"}], "maskedPaths": ["/proc/acpi", "/proc/asound", "/proc/kcore", "/proc/keys", "/proc/latency_stats", "/proc/timer_list", "/proc/timer_stats", "/proc/sched_debug", "/sys/firmware", "/proc/scsi"], "readonlyPaths": ["/proc/bus", "/proc/fs", "/proc/irq", "/proc/sys", "/proc/sysrq-trigger"]}}

config/nerdctl.toml

@@ -0,0 +1,10 @@
+debug             = false
+debug_full        = false
+address           = "unix:///var/run/containerd/containerd.sock"
+namespace         = "k8s.io"
+snapshotter       = "native"
+cni_path          = "/opt/cni/bin"
+cni_netconfpath   = "/etc/cni/net.d"
+cgroup_manager    = "systemd"
+insecure_registry = false
+hosts_dir         = ["/etc/containerd/certs.d"]

install.sh

@@ -29,6 +29,8 @@ NGINX_CONFIG_FILE="${KUBE_ROOT}/config/nginx.conf"
 REGISTRY_CONFIG_FILE="${KUBE_ROOT}/config/registry.yaml"
 CONTAINERD_CONFIG_FILE="${KUBE_ROOT}/config/containerd.toml"
 CONTAINERD_SERVICE_FILE="${KUBE_ROOT}/config/containerd.service"
+CONTAINERD_CRI_BASE_CONFIG_FILE="${KUBE_ROOT}/config/cri-base.json"
+NERDCTL_CONFIG_FILE="${KUBE_ROOT}/config/nerdctl.toml"
 
 # Include all functions from library/*.sh
 for file in ${KUBE_ROOT}/library/*.sh; do source ${file}; done

library/common.sh

@@ -4,6 +4,7 @@
 # Set logging colors
 #
 
+set +e
 NORMAL_COL=$(tput sgr0)
 RED_COL=$(tput setaf 1)
 WHITE_COL=$(tput setaf 7)
@@ -14,6 +15,7 @@ debuglog(){ printf "${WHITE_COL}%s${NORMAL_COL}\n" "$@"; }
 infolog(){ printf "${GREEN_COL}✔ %s${NORMAL_COL}\n" "$@"; }
 warnlog(){ printf "${YELLOW_COL}➜ %s${NORMAL_COL}\n" "$@"; }
 errorlog(){ printf "${RED_COL}✖ %s${NORMAL_COL}\n" "$@"; }
+set -e
 
 common::usage(){
   cat <<EOF
@@ -59,7 +61,12 @@ common::install_tools(){
 
   # Install containerd and buildkit
   local nerdctl_tar_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "nerdctl-*-linux-${ARCH}.tar.gz" | sort -r --version-sort | head -n1)
-  tar -xf ${nerdctl_tar_file} -C /usr/bin/
+  tar -xf ${nerdctl_tar_file} -C /usr/local/bin/
+  mkdir -p /etc/nerdctl
+  /bin/cp -f ${NERDCTL_CONFIG_FILE} /etc/nerdctl/nerdctl.toml
+  local cni_plugins_tar_file=$(find ${RESOURCES_NGINX_DIR}/ -type f -name "cni-plugins-linux-${ARCH}-*.tgz" | sort -r --version-sort | head -n1)
+  mkdir -p /opt/cni/bin/
+  tar -xf ${cni_plugins_tar_file} -C /opt/cni/bin/
   mkdir -p /etc/containerd
   DATA_DIR=$(yq  eval '.kubespray.data_dir' ${CONFIG_FILE})
   if [[ "${DATA_DIR}" == "null" ]]; then
@@ -74,7 +81,8 @@ common::install_tools(){
       REGISTRY_DOMAIN="${IMAGEREPO_DOMAIN}:${REGISTRY_HTTPS_PORT}"
   fi
   fi
-  /bin/cp -f ${CONTAINERD_CONFIG_FILE} /etc/containerd/config.toml
+  /bin/cp -f ${CONTAINERD_CONFIG_FILE} /etc/containerd/config.toml 
+  /bin/cp -f ${CONTAINERD_CRI_BASE_CONFIG_FILE} /etc/containerd/cri-base.json
   sed -i "s|CONTAINERD_ROOT_DIR|${CONTAINERD_ROOT_DIR}|g"   /etc/containerd/config.toml
   sed -i "s|REGISTRY_DOMAIN|${REGISTRY_DOMAIN}|g"           /etc/containerd/config.toml
   systemctl daemon-reload
@@ -148,6 +156,7 @@ common::generate_domain_certs(){
     # Copy domain.crt, domain.key to nginx certs directory
     infolog "Copy certs to ${COMPOSE_CONFIG_DIR}"
     cp -f ${CERTS_DIR}/rootCA.pem ${RESOURCES_NGINX_DIR}/certs/rootCA.crt
+    chmod -R 777 ${RESOURCES_NGINX_DIR}/certs/
   fi
 }
 
@@ -223,11 +232,11 @@ common::run_kubespray(){
   infolog "进入后台安装，可以ctrl-C退出"
   infolog "进入后台安装，可以ctrl-C退出"
   sleep 3
-  infolog "如果log停止，可以自行退出重新输入'nerdctl logs -f kubespray-runner'查看日志"
-  infolog "如果log停止，可以自行退出重新输入'nerdctl logs -f kubespray-runner'查看日志"
-  infolog "如果log停止，可以自行退出重新输入'nerdctl logs -f kubespray-runner'查看日志"
+  infolog "如果log停止，可以自行退出重新输入  tail -f ${KUBESPRAYDIR}/runner.log  查看日志"
+  infolog "如果log停止，可以自行退出重新输入  tail -f ${KUBESPRAYDIR}/runner.log  查看日志"
+  infolog "如果log停止，可以自行退出重新输入  tail -f ${KUBESPRAYDIR}/runner.log  查看日志"
   sleep 3
-  nerdctl logs -f kubespray-runner
+  tail -f ${KUBESPRAYDIR}/runner.log
 }
 
 # Push kubespray image to registry

library/system.sh

@@ -29,7 +29,7 @@ system::centos::config_repo(){
     infolog "Updated the repo file successfully"
   fi
   local containerd_tar_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "containerd-*-linux-${ARCH}.tar.gz" | sort -r --version-sort | head -n1)
-  tar -xf ${containerd_tar_file} -C /usr/bin/
+  tar -xf ${containerd_tar_file} -C /usr/bin/ --strip-components=1
   local runc_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "runc.${ARCH}" | sort -r --version-sort | head -n1)
   cp -raf ${runc_file} /usr/bin/runc
   chmod 0755 /usr/bin/runc
@@ -48,7 +48,7 @@ system::fedora::config_repo(){
     infolog "Updated the repo file successfully"
   fi
   local containerd_tar_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "containerd-*-linux-${ARCH}.tar.gz" | sort -r --version-sort | head -n1)
-  tar -xf ${containerd_tar_file} -C /usr/bin/
+  tar -xf ${containerd_tar_file} -C /usr/bin/ --strip-components=1
   local runc_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "runc.${ARCH}" | sort -r --version-sort | head -n1)
   cp -raf ${runc_file} /usr/bin/runc
   chmod 0755 /usr/bin/runc
@@ -66,7 +66,7 @@ system::debian::config_repo(){
     infolog "Updated the repo file successfully"
   fi
   local containerd_tar_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "containerd-*-linux-${ARCH}.tar.gz" | sort -r --version-sort | head -n1)
-  tar -xf ${containerd_tar_file} -C /usr/bin/
+  tar -xf ${containerd_tar_file} -C /usr/bin/ --strip-components=1
   local runc_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "runc.${ARCH}" | sort -r --version-sort | head -n1)
   cp -raf ${runc_file} /usr/bin/runc
   chmod 0755 /usr/bin/runc
@@ -84,7 +84,7 @@ system::ubuntu::config_repo(){
     infolog "Updated the repo file successfully"
   fi
   local containerd_tar_file=$(find ${RESOURCES_NGINX_DIR}/tools -type f -name "containerd-*-linux-${ARCH}.tar.gz" | sort -r --version-sort | head -n1)
-  tar -xf ${containerd_tar_file} -C /usr/bin/
+  tar -xf ${containerd_tar_file} -C /usr/bin/ --strip-components=1
   local runc_file=$(find ${RESOURCES_NGINX_DIR}/files -type f -name "runc.${ARCH}" | sort -r --version-sort | head -n1)
   cp -raf ${runc_file} /usr/bin/runc
   chmod 0755 /usr/bin/runc