From c2d960e470014d11c40017ef6c47a37011615359 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 20:17:33 +0000 Subject: [PATCH 01/10] remove cri-docker --- docker_kube/README.md | 20 ++++---- docker_kube/work/script-get-k3s-io.sh | 13 ++++-- docker_kube/work/script-setup-k3s.sh | 66 --------------------------- 3 files changed, 16 insertions(+), 83 deletions(-) diff --git a/docker_kube/README.md b/docker_kube/README.md index ee321f6..70fb798 100644 --- a/docker_kube/README.md +++ b/docker_kube/README.md @@ -45,28 +45,24 @@ Import the K3s system images into your Docker daemon: ```bash cd /opt/k3s zstd -cd ./k3s-airgap-images-${ARCH:-amd64}.tar.zst | docker load -``` - -#### 3. Configure and start cri-dockerd -```bash -# Generate systemd socket and service unit files -source ./script-setup-k3s.sh && create_cri_dockerd_unit_files -# Enable and start the service -sudo systemctl daemon-reload -sudo systemctl enable --now cri-docker.socket cri-docker.service +# (Optional) Link binaries to PATH +sudo ln -sf /opt/k3s/k3s* /opt/k3s/kubectl /usr/local/bin/ ``` -#### 4. Run the offline installer +#### 3. Run the offline installer ```bash INSTALL_K3S_SKIP_DOWNLOAD=true \ INSTALL_K3S_BIN_DIR=/opt/k3s \ ./script-get-k3s-io.sh --docker --data-dir /data/storage/data-k3s ``` -#### 5. Link binaries to PATH (Optional) +#### 4. (Optional) Manually start k3s without systemd +For environment like Github Codespace, you might want to start k3s without systemd: ```bash -sudo ln -sf /opt/k3s/k3s* /opt/k3s/kubectl /opt/k3s/cri-dockerd /usr/local/bin/ +sudo k3s server \ + --docker \ + --container-runtime-endpoint unix:///var/run/docker.sock ``` --- diff --git a/docker_kube/work/script-get-k3s-io.sh b/docker_kube/work/script-get-k3s-io.sh index 9dca48e..34c39db 100644 --- a/docker_kube/work/script-get-k3s-io.sh +++ b/docker_kube/work/script-get-k3s-io.sh @@ -606,13 +606,16 @@ setup_selinux() { rpm_target=sle rpm_site_infix=microos package_installer=zypper - if [ "${ID_LIKE:-}" = suse ] && ( [ "${VARIANT_ID:-}" = sle-micro ] || [ "${ID:-}" = sle-micro ] ); then - rpm_target=sle + + # SleMicro 6.2 and SLEs 16 uses the same ID and same VERSION_ID in case the ID and VERSION_ID changes we will catch SLEMicro 6.2 using VARIANT_ID transactional + if [ "${ID:-}" = sles ] && [ -n "${VERSION_ID}" ] && [ "${VERSION_ID%%.*}" -ge 16 ]; then + rpm_site_infix=slemicro + elif [ "${VARIANT_ID:-}" = sle-micro ] || [ "${VARIANT_ID:-}" = transactional ] || [ "${ID:-}" = sle-micro ] || [ "${ID:-}" = sl-micro ] || [ "${ID:-}" = sle-micro-rancher ]; then rpm_site_infix=slemicro - package_installer=zypper fi - # cover any atomic fedora flavors using rpm-ostree - elif { [ "${ID:-}" = fedora ] || [ "${ID_LIKE:-}" = fedora ]; } && [ -n "${OSTREE_VERSION:-}" ]; then + + # cover coreos derivatives like flatcar, plus any atomic fedora flavors using rpm-ostree + elif [ "${ID_LIKE:-}" = coreos ] || { { [ "${ID:-}" = fedora ] || [ "${ID_LIKE:-}" = fedora ]; } && [ -n "${OSTREE_VERSION:-}" ]; }; then rpm_target=coreos rpm_site_infix=coreos package_installer=rpm-ostree diff --git a/docker_kube/work/script-setup-k3s.sh b/docker_kube/work/script-setup-k3s.sh index f17cd42..ff65091 100644 --- a/docker_kube/work/script-setup-k3s.sh +++ b/docker_kube/work/script-setup-k3s.sh @@ -10,75 +10,9 @@ setup_k3s() { /opt/k3s/k3s --version } -setup_cri_dockerd() { - # Install the latest release: https://mirantis.github.io/cri-dockerd/usage/install-manually/ - VER_CRI_DOCKERD=$(curl -sL https://github.com/Mirantis/cri-dockerd/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | grep -Po '\d[\d.]+' ) \ - && URL_CRI_DOCKERD="https://github.com/Mirantis/cri-dockerd/releases/download/v$VER_CRI_DOCKERD/cri-dockerd-$VER_CRI_DOCKERD.$ARCH.tgz" \ - && echo "Downloading cri-dockerd version ${VER_CRI_DOCKERD} from: ${URL_CRI_DOCKERD}" \ - && mkdir -pv /opt/k3s && curl -L -o /tmp/cri-dockerd.tgz $URL_CRI_DOCKERD \ - && tar -xzvf /tmp/cri-dockerd.tgz -C /opt/k3s/ --strip-components=1 cri-dockerd/cri-dockerd \ - && chmod +x /opt/k3s/cri-dockerd - /opt/k3s/cri-dockerd --version -} - - setup_k3s_pack() { # Download k3s image for offline-mode installation VER_K3S=$(curl -sL https://github.com/k3s-io/k3s/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | grep -Po '\d[\d.]+' ) \ && URL_K3S_IMGS="https://github.com/k3s-io/k3s/releases/download/v$VER_K3S%2Bk3s1/k3s-airgap-images-${ARCH}.tar.zst" \ && curl -L -o /opt/k3s/k3s-airgap-images-${ARCH}.tar.zst $URL_K3S_IMGS } - - -create_cri_dockerd_unit_files() { - local SYSTEMD_DIR="/etc/systemd/system" - local FILE_SOCKET="${SYSTEMD_DIR}/cri-docker.socket" - local FILE_SERVICE="${SYSTEMD_DIR}/cri-docker.service" - - echo "Creating ${FILE_SOCKET} and ${FILE_SERVICE} ..." - - sudo tee "${FILE_SOCKET}" >/dev/null <<'EOF' -[Unit] -Description=CRI Docker Socket for the API -PartOf=cri-docker.service - -[Socket] -ListenStream=/var/run/cri-dockerd.sock -SocketMode=0660 -SocketUser=root -SocketGroup=docker - -[Install] -WantedBy=sockets.target -EOF - - sudo tee "${FILE_SERVICE}" >/dev/null <<'EOF' -[Unit] -Description=CRI Interface for Docker Application Container Engine -Documentation=https://docs.mirantis.com -After=network-online.target firewalld.service docker.service -Wants=network-online.target -Requires=cri-docker.socket - -[Service] -Type=notify -ExecStart=/opt/k3s/cri-dockerd --container-runtime-endpoint fd:// -ExecReload=/bin/kill -s HUP $MAINPID -TimeoutSec=0 -RestartSec=2 -Restart=always -StartLimitBurst=3 -StartLimitInterval=60s -LimitNOFILE=infinity -LimitNPROC=infinity -LimitCORE=infinity - -# Comment TasksMax if your systemd version does not support it. -TasksMax=infinity -Delegate=yes -KillMode=process - -[Install] -WantedBy=multi-user.target -EOF -} From cb3d89ce72f39de0c407685b137fd759d3fa1f68 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 21:12:45 +0000 Subject: [PATCH 02/10] md updates --- docker_kube/README.md | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/docker_kube/README.md b/docker_kube/README.md index 70fb798..d2d9b38 100644 --- a/docker_kube/README.md +++ b/docker_kube/README.md @@ -24,7 +24,6 @@ The tools and files included in each container image: | **Air-gap Image Bundle** | `k3s-airgap-images-*.tar.zst` | `k0s-airgap-bundle-*` | System container images bundle for offline deployment. | | **Kubernetes CLI** | `kubectl` | `kubectl` | Command-line tool for control plane operations. | | **Package Manager** | `helm` | `helm` | Tool for managing Kubernetes pre-packaged charts. | -| **CRI Adapter** | `cri-dockerd` | *N/A* | Adapter to use Docker as the container runtime (embedded in K0s). | | **Official Installer** | `script-get-k3s-io.sh` | *N/A* | Official installation script (embedded in K0s). | | **Setup Helper Script** | `script-setup-k3s.sh` | `script-setup-k0s.sh` | Scripts containing functions for configuration and setup. | @@ -65,6 +64,22 @@ sudo k3s server \ --container-runtime-endpoint unix:///var/run/docker.sock ``` +#### 5. Access the k3s cluster with kubectl + +Copy the k3s default kube config file `/etc/rancher/k3s/k3s.yaml` for current user and use kubectl. + +```bash +mkdir -pv ~/.kube +sudo cp /etc/rancher/k3s/k3s.yaml ~/.kube/config +sudo chown "$(id -u):$(id -g)" ~/.kube/config +chmod 600 ~/.kube/config + +kubectl cluster-info +kubectl get nodes -o wide +kubectl get pods -A +kubectl get services -A +``` + --- ### Option B: Install K0s @@ -80,8 +95,8 @@ K0s loads offline images from `/var/lib/k0s/images/` by default. ```bash cd /opt/k0s -# Copy binaries to PATH -sudo cp ./k0s ./kubectl ./helm /usr/local/bin/ +# (Optional) Link binaries to PATH +sudo ln -sf ./k0s ./kubectl ./helm /usr/local/bin/ # Copy the air-gap bundle to the designated directory sudo mkdir -p /var/lib/k0s/images/ From 4723dc9914e21b045567e1ee79bf375e16170168 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 21:29:39 +0000 Subject: [PATCH 03/10] update ver specify --- .github/workflows/build-docker.yml | 4 +- docker_kube/k3s-ctk.Dockerfile | 6 +-- docker_kube/work/script-setup-k0s.sh | 22 +++++++++-- docker_kube/work/script-setup-k3d.sh | 11 ------ docker_kube/work/script-setup-k3s.sh | 41 +++++++++++++++++++-- docker_kube/work/script-setup-k8s-common.sh | 32 +++++++++++++--- 6 files changed, 87 insertions(+), 29 deletions(-) delete mode 100644 docker_kube/work/script-setup-k3d.sh diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index a2afa74..40001fe 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -7,13 +7,15 @@ on: pull_request: branches: [ "main" ] paths-ignore: [ "*.md" ] - workflow_dispatch: # Allows you to run this workflow manually from the Actions tab concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +permissions: + contents: read + env: BUILDKIT_PROGRESS: "plain" # Full logs for CI build. REGISTRY_SRC: ${{ vars.REGISTRY_SRC || 'quay.io' }} # For BASE_NAMESPACE of images: where to pull base images from, docker.io or other source registry URL. diff --git a/docker_kube/k3s-ctk.Dockerfile b/docker_kube/k3s-ctk.Dockerfile index e86568e..317a493 100644 --- a/docker_kube/k3s-ctk.Dockerfile +++ b/docker_kube/k3s-ctk.Dockerfile @@ -10,9 +10,9 @@ COPY work /opt/utils/ RUN set -eux && chmod +x /opt/utils/*.sh \ && source /opt/utils/script-setup-k8s-common.sh && setup_verify_arch && setup_kubectl && setup_helm && setup_k9s \ - && source /opt/utils/script-setup-k3s.sh && setup_k3s && setup_cri_dockerd && setup_k3s_pack \ - && mv /opt/k8s/* /opt/k3s/ \ - && mv /opt/utils/script-setup-k3s.sh /opt/utils/script-get-k3s-io.sh /opt/k3s/ \ + && source /opt/utils/script-setup-k3s.sh && setup_k3s && setup_k3s_pack \ + && mv /opt/k8s/* /opt/k3s/ \ + && mv /opt/utils/script-setup-k3s.sh /opt/utils/script-get-k3s-io.sh /opt/k3s/ \ && rm -rf /opt/k8s && ls -alh /opt/* diff --git a/docker_kube/work/script-setup-k0s.sh b/docker_kube/work/script-setup-k0s.sh index 6780c29..8cd2b1c 100644 --- a/docker_kube/work/script-setup-k0s.sh +++ b/docker_kube/work/script-setup-k0s.sh @@ -1,8 +1,15 @@ # k0s Air-gap Install: https://docs.k0sproject.io/head/airgap-install/ setup_k0s() { - VER_K0S=$(curl -sL https://docs.k0sproject.io/stable.txt) \ - && URL_K0S="https://github.com/k0sproject/k0s/releases/download/${VER_K0S}/k0s-${VER_K0S}-${ARCH}" \ + local VER_K0S_REQ="${1:-}" VER_K0S URL_K0S + VER_K0S="${VER_K0S_REQ#v}" + if [ -z "${VER_K0S}" ]; then + VER_K0S=$(curl -sL https://docs.k0sproject.io/stable.txt) + VER_K0S="${VER_K0S#v}" + fi + [ -n "${VER_K0S}" ] || return 1 + VER_K0S="v${VER_K0S}" + URL_K0S="https://github.com/k0sproject/k0s/releases/download/${VER_K0S}/k0s-${VER_K0S}-${ARCH}" \ && echo "Downloading k0s version ${VER_K0S} from ${URL_K0S}" \ && mkdir -pv /opt/k0s && curl -L -o /opt/k0s/k0s ${URL_K0S} \ && chmod +x /opt/k0s/k0s @@ -10,8 +17,15 @@ setup_k0s() { } setup_k0s_pack() { - VER_K0S=$(curl -sL https://docs.k0sproject.io/stable.txt) \ - && URL_K0S_IMG="https://github.com/k0sproject/k0s/releases/download/${VER_K0S}/k0s-airgap-bundle-${VER_K0S}-${ARCH}" \ + local VER_K0S_REQ="${1:-}" VER_K0S URL_K0S_IMG + VER_K0S="${VER_K0S_REQ#v}" + if [ -z "${VER_K0S}" ]; then + VER_K0S=$(curl -sL https://docs.k0sproject.io/stable.txt) + VER_K0S="${VER_K0S#v}" + fi + [ -n "${VER_K0S}" ] || return 1 + VER_K0S="v${VER_K0S}" + URL_K0S_IMG="https://github.com/k0sproject/k0s/releases/download/${VER_K0S}/k0s-airgap-bundle-${VER_K0S}-${ARCH}" \ && echo "Downloading k0s airgap images version ${VER_K0S} from ${URL_K0S_IMG}" \ && curl -L -o "/opt/k0s/k0s-airgap-bundle-${VER_K0S}-${ARCH}" ${URL_K0S_IMG} } diff --git a/docker_kube/work/script-setup-k3d.sh b/docker_kube/work/script-setup-k3d.sh deleted file mode 100644 index d06134b..0000000 --- a/docker_kube/work/script-setup-k3d.sh +++ /dev/null @@ -1,11 +0,0 @@ -setup_k3d() { - # Install the latest release: https://github.com/k3d-io/k3d - VER_K3D=$(curl -sL https://github.com/k3d-io/k3d/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) \ - && URL_K3D="https://github.com/k3d-io/k3d/releases/download/v$VER_K3D/k3d-linux-$ARCH" \ - && echo "Downloading k3d version ${VER_K3D} from: ${URL_K3D}" \ - && mkdir -pv /opt/k3s && curl -L -o /opt/k3s/k3d $URL_K3D \ - && curl -L -o /opt/k3s/install_k3d.sh https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh \ - && chmod +x /opt/k3s/*k3d* - - /opt/k3s/k3d --version -} diff --git a/docker_kube/work/script-setup-k3s.sh b/docker_kube/work/script-setup-k3s.sh index ff65091..86a0d56 100644 --- a/docker_kube/work/script-setup-k3s.sh +++ b/docker_kube/work/script-setup-k3s.sh @@ -1,9 +1,16 @@ # k3s Air-gap Install: https://docs.k3s.io/installation/airgap?airgap-load-images=Manually+Deploy+Images setup_k3s() { + local VER_K3S_REQ="${1:-}" VER_K3S URL_K3S + # Install the latest release: https://github.com/k3d-io/k3s - VER_K3S=$(curl -sL https://github.com/k3s-io/k3s/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | grep -Po '\d[\d.]+' ) \ - && URL_K3S="https://github.com/k3s-io/k3s/releases/download/v$VER_K3S%2Bk3s1/k3s${SUFFIX}" \ + VER_K3S="${VER_K3S_REQ#v}" + VER_K3S="${VER_K3S%%+k3s1}" + if [ -z "${VER_K3S}" ]; then + VER_K3S=$(curl -sL https://github.com/k3s-io/k3s/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | grep -Po '\d[\d.]+' ) + fi + [ -n "${VER_K3S}" ] || return 1 + URL_K3S="https://github.com/k3s-io/k3s/releases/download/v$VER_K3S%2Bk3s1/k3s${SUFFIX}" \ && echo "Downloading k3s version ${VER_K3S} from: ${URL_K3S}" \ && mkdir -pv /opt/k3s && curl -L -o /opt/k3s/k3s $URL_K3S \ && chmod +x /opt/k3s/*k3s* @@ -11,8 +18,34 @@ setup_k3s() { } setup_k3s_pack() { + local VER_K3S_REQ="${1:-}" VER_K3S URL_K3S_IMGS + # Download k3s image for offline-mode installation - VER_K3S=$(curl -sL https://github.com/k3s-io/k3s/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | grep -Po '\d[\d.]+' ) \ - && URL_K3S_IMGS="https://github.com/k3s-io/k3s/releases/download/v$VER_K3S%2Bk3s1/k3s-airgap-images-${ARCH}.tar.zst" \ + VER_K3S="${VER_K3S_REQ#v}" + VER_K3S="${VER_K3S%%+k3s1}" + if [ -z "${VER_K3S}" ]; then + VER_K3S=$(curl -sL https://github.com/k3s-io/k3s/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | grep -Po '\d[\d.]+' ) + fi + [ -n "${VER_K3S}" ] || return 1 + URL_K3S_IMGS="https://github.com/k3s-io/k3s/releases/download/v$VER_K3S%2Bk3s1/k3s-airgap-images-${ARCH}.tar.zst" \ && curl -L -o /opt/k3s/k3s-airgap-images-${ARCH}.tar.zst $URL_K3S_IMGS } + + +setup_k3d() { + local VER_K3D_REQ="${1:-}" VER_K3D URL_K3D + + # Install the latest release: https://github.com/k3d-io/k3d + VER_K3D="${VER_K3D_REQ#v}" + if [ -z "${VER_K3D}" ]; then + VER_K3D=$(curl -sL https://github.com/k3d-io/k3d/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) + fi + [ -n "${VER_K3D}" ] || return 1 + URL_K3D="https://github.com/k3d-io/k3d/releases/download/v$VER_K3D/k3d-linux-$ARCH" \ + && echo "Downloading k3d version ${VER_K3D} from: ${URL_K3D}" \ + && mkdir -pv /opt/k3s && curl -L -o /opt/k3s/k3d $URL_K3D \ + && curl -L -o /opt/k3s/install_k3d.sh https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh \ + && chmod +x /opt/k3s/*k3d* + + /opt/k3s/k3d --version +} diff --git a/docker_kube/work/script-setup-k8s-common.sh b/docker_kube/work/script-setup-k8s-common.sh index c7ebe55..7f37fab 100644 --- a/docker_kube/work/script-setup-k8s-common.sh +++ b/docker_kube/work/script-setup-k8s-common.sh @@ -11,9 +11,16 @@ setup_verify_arch() { setup_kubectl() { + local VER_KUBECTL_REQ="${1:-}" VER_KUBECTL URL_KUBECTL + # https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/#install-kubectl-binary-with-curl-on-linux - VER_KUBECTL=$(curl -L -s https://dl.k8s.io/release/stable.txt) \ - && URL_KUBECTL="https://dl.k8s.io/release/$VER_KUBECTL/bin/linux/$ARCH/kubectl" \ + VER_KUBECTL="${VER_KUBECTL_REQ#v}" + if [ -z "${VER_KUBECTL}" ]; then + VER_KUBECTL=$(curl -L -s https://dl.k8s.io/release/stable.txt) + VER_KUBECTL="${VER_KUBECTL#v}" + fi + [ -n "${VER_KUBECTL}" ] || return 1 + URL_KUBECTL="https://dl.k8s.io/release/v$VER_KUBECTL/bin/linux/$ARCH/kubectl" \ && echo "Downloading kubectl version ${VER_KUBECTL} from: ${URL_KUBECTL}" \ && mkdir -pv /opt/k8s \ && curl -L -o /opt/k8s/kubectl $URL_KUBECTL \ @@ -22,8 +29,14 @@ setup_kubectl() { } setup_helm() { - VER_HELM=$(curl -s https://api.github.com/repos/helm/helm/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') \ - && URL_HELM="https://get.helm.sh/helm-${VER_HELM}-linux-${ARCH}.tar.gz" \ + local VER_HELM_REQ="${1:-}" VER_HELM URL_HELM + VER_HELM="${VER_HELM_REQ#v}" + if [ -z "${VER_HELM}" ]; then + VER_HELM=$(curl -s https://api.github.com/repos/helm/helm/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + VER_HELM="${VER_HELM#v}" + fi + [ -n "${VER_HELM}" ] || return 1 + URL_HELM="https://get.helm.sh/helm-v${VER_HELM}-linux-${ARCH}.tar.gz" \ && echo "Downloading Helm version ${VER_HELM} from: ${URL_HELM}" \ && curl -L -s -o /tmp/helm.tar.gz "${URL_HELM}" \ && mkdir -pv /opt/k8s \ @@ -33,12 +46,19 @@ setup_helm() { } setup_k9s() { + local VER_K9S_REQ="${1:-}" VER_K9S URL_K9S + # ref: https://github.com/derailed/k9s , the binary is roughly 120MB local K9S_ARCH=$ARCH [ "$K9S_ARCH" = "arm" ] && K9S_ARCH="armv7" - VER_K9S=$(curl -sL https://github.com/derailed/k9s/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | sed -E 's/.*\/tag\/([^"]+).*/\1/') \ - && URL_K9S="https://github.com/derailed/k9s/releases/download/${VER_K9S}/k9s_Linux_${K9S_ARCH}.tar.gz" \ + VER_K9S="${VER_K9S_REQ#v}" + if [ -z "${VER_K9S}" ]; then + VER_K9S=$(curl -sL https://github.com/derailed/k9s/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | sed -E 's/.*\/tag\/([^"]+).*/\1/') + VER_K9S="${VER_K9S#v}" + fi + [ -n "${VER_K9S}" ] || return 1 + URL_K9S="https://github.com/derailed/k9s/releases/download/v${VER_K9S}/k9s_Linux_${K9S_ARCH}.tar.gz" \ && echo "Downloading K9s version ${VER_K9S} from: ${URL_K9S}" \ && curl -L -s -o /tmp/k9s.tar.gz "${URL_K9S}" \ && mkdir -pv /opt/k8s \ From a1661a7cd7e8a3303c42add049aae9a392436d02 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 22:02:32 +0000 Subject: [PATCH 04/10] update k0s install --- .github/workflows/build-docker.yml | 6 +++--- docker_kube/README.md | 27 +++++++++++++++++++++++---- docker_kube/work/script-setup-k0s.sh | 12 +++++++----- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 40001fe..3cf5263 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -33,7 +33,7 @@ jobs: name: 'k3s-ctk' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - run: | source ./tool.sh && build_image k3s-ctk latest docker_kube/k3s-ctk.Dockerfile && push_image @@ -41,7 +41,7 @@ jobs: name: 'k0s-ctk' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - run: | source ./tool.sh && build_image k0s-ctk latest docker_kube/k0s-ctk.Dockerfile && push_image @@ -51,7 +51,7 @@ jobs: needs: ["job-k3s-ctk", "job-k0s-ctk"] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - env: AUTH_FILE_CONTENT: ${{ secrets.AUTH_FILE_CONTENT }} DOCKER_MIRROR_REGISTRY: ${{ vars.DOCKER_MIRROR_REGISTRY }} diff --git a/docker_kube/README.md b/docker_kube/README.md index d2d9b38..2c83749 100644 --- a/docker_kube/README.md +++ b/docker_kube/README.md @@ -44,9 +44,10 @@ Import the K3s system images into your Docker daemon: ```bash cd /opt/k3s zstd -cd ./k3s-airgap-images-${ARCH:-amd64}.tar.zst | docker load +sudo rm -f /opt/k3s/k3s-*.tar.zst # (Optional) Link binaries to PATH -sudo ln -sf /opt/k3s/k3s* /opt/k3s/kubectl /usr/local/bin/ +sudo ln -sf /opt/k3s/k* /opt/k3s/helm /usr/local/bin/ ``` #### 3. Run the offline installer @@ -96,11 +97,12 @@ K0s loads offline images from `/var/lib/k0s/images/` by default. cd /opt/k0s # (Optional) Link binaries to PATH -sudo ln -sf ./k0s ./kubectl ./helm /usr/local/bin/ +sudo ln -sf /opt/k0s/k* /opt/k0s/helm /usr/local/bin/ # Copy the air-gap bundle to the designated directory sudo mkdir -p /var/lib/k0s/images/ -sudo cp ./k0s-airgap-bundle-* /var/lib/k0s/images/ +sudo cat ./k0s-airgap-bundle-* | docker load +sudo rm -f ./k0s-airgap-bundle-* ``` #### 3. Install and start K0s service @@ -112,8 +114,25 @@ sudo k0s install controller --single --enable-worker sudo k0s start ``` -#### 4. Verify installation +#### 4. (Optional) Manually start k0s without systemd +```bash +sudo k0s controller --single --enable-worker -v +``` + +#### 5. Verify installation ```bash sudo k0s status sudo k0s kubectl get nodes + + + +mkdir -pv ~/.kube +sudo k0s kubeconfig admin > ~/.kube/config +sudo chown "$(id -u):$(id -g)" ~/.kube/config +chmod 600 ~/.kube/config + +kubectl cluster-info +kubectl get nodes -o wide +kubectl get pods -A +kubectl get services -A ``` diff --git a/docker_kube/work/script-setup-k0s.sh b/docker_kube/work/script-setup-k0s.sh index 8cd2b1c..aeff023 100644 --- a/docker_kube/work/script-setup-k0s.sh +++ b/docker_kube/work/script-setup-k0s.sh @@ -1,7 +1,7 @@ # k0s Air-gap Install: https://docs.k0sproject.io/head/airgap-install/ setup_k0s() { - local VER_K0S_REQ="${1:-}" VER_K0S URL_K0S + local VER_K0S_REQ="${1:-}" VER_K0S VER_K0S_URL URL_K0S VER_K0S="${VER_K0S_REQ#v}" if [ -z "${VER_K0S}" ]; then VER_K0S=$(curl -sL https://docs.k0sproject.io/stable.txt) @@ -9,7 +9,8 @@ setup_k0s() { fi [ -n "${VER_K0S}" ] || return 1 VER_K0S="v${VER_K0S}" - URL_K0S="https://github.com/k0sproject/k0s/releases/download/${VER_K0S}/k0s-${VER_K0S}-${ARCH}" \ + VER_K0S_URL="${VER_K0S//+/%2B}" + URL_K0S="https://github.com/k0sproject/k0s/releases/download/${VER_K0S_URL}/k0s-${VER_K0S_URL}-${ARCH}" \ && echo "Downloading k0s version ${VER_K0S} from ${URL_K0S}" \ && mkdir -pv /opt/k0s && curl -L -o /opt/k0s/k0s ${URL_K0S} \ && chmod +x /opt/k0s/k0s @@ -17,7 +18,7 @@ setup_k0s() { } setup_k0s_pack() { - local VER_K0S_REQ="${1:-}" VER_K0S URL_K0S_IMG + local VER_K0S_REQ="${1:-}" VER_K0S VER_K0S_URL URL_K0S_IMG VER_K0S="${VER_K0S_REQ#v}" if [ -z "${VER_K0S}" ]; then VER_K0S=$(curl -sL https://docs.k0sproject.io/stable.txt) @@ -25,7 +26,8 @@ setup_k0s_pack() { fi [ -n "${VER_K0S}" ] || return 1 VER_K0S="v${VER_K0S}" - URL_K0S_IMG="https://github.com/k0sproject/k0s/releases/download/${VER_K0S}/k0s-airgap-bundle-${VER_K0S}-${ARCH}" \ + VER_K0S_URL="${VER_K0S//+/%2B}" + URL_K0S_IMG="https://github.com/k0sproject/k0s/releases/download/${VER_K0S_URL}/k0s-airgap-bundle-${VER_K0S_URL}-linux-${ARCH}.tar" \ && echo "Downloading k0s airgap images version ${VER_K0S} from ${URL_K0S_IMG}" \ - && curl -L -o "/opt/k0s/k0s-airgap-bundle-${VER_K0S}-${ARCH}" ${URL_K0S_IMG} + && curl -L -o "/opt/k0s/k0s-airgap-bundle-${VER_K0S}-linux-${ARCH}.tar" "${URL_K0S_IMG}" } From c2fd38a2b15099fc9fa5892c4e387342218c77b6 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 22:26:39 +0000 Subject: [PATCH 05/10] update build process --- .github/workflows/build-docker.yml | 12 ++++++++--- docker_kube/k0s-ctk.Dockerfile | 9 +++++--- docker_kube/k3s-ctk.Dockerfile | 7 +++++-- tool.sh | 33 ++++++++++++++++++------------ 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 3cf5263..67dc82e 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -26,7 +26,7 @@ env: # used to sync image to mirror registry DOCKER_MIRROR_REGISTRY_USERNAME: ${{ vars.DOCKER_MIRROR_REGISTRY_USERNAME }} DOCKER_MIRROR_REGISTRY_PASSWORD: ${{ secrets.DOCKER_MIRROR_REGISTRY_PASSWORD }} - CI_PROJECT_NAME: ${{ vars.CI_PROJECT_NAME || 'LabNow/lab-container' }} + CI_PROJECT_NAME: ${{ vars.CI_PROJECT_NAME || 'LabNow/lab-container-kit' }} jobs: job-k3s-ctk: @@ -35,7 +35,10 @@ jobs: steps: - uses: actions/checkout@v7 - run: | - source ./tool.sh && build_image k3s-ctk latest docker_kube/k3s-ctk.Dockerfile && push_image + source ./tool.sh && K8S_VERSION=1.37.1 + build_image_no_tag k3s-ctk latest docker_kube/k3s-ctk.Dockerfile --build-arg K8S_VERSION=${K8S_VERSION} + alias_image k3s-ctk latest k3s-ctk:${K8S_VERSION} + push_image ${K8S_VERSION} job-k0s-ctk: name: 'k0s-ctk' @@ -43,7 +46,10 @@ jobs: steps: - uses: actions/checkout@v7 - run: | - source ./tool.sh && build_image k0s-ctk latest docker_kube/k0s-ctk.Dockerfile && push_image + source ./tool.sh && K8S_VERSION=1.37.1 + build_image_no_tag k0s-ctk latest docker_kube/k0s-ctk.Dockerfile --build-arg K8S_VERSION=${K8S_VERSION} + alias_image k0s-ctk latest k0s-ctk:${K8S_VERSION} + push_image ${K8S_VERSION} ## Sync all images in this build (listed by "names") to mirror registry. diff --git a/docker_kube/k0s-ctk.Dockerfile b/docker_kube/k0s-ctk.Dockerfile index 6aa8b93..cb64ac7 100644 --- a/docker_kube/k0s-ctk.Dockerfile +++ b/docker_kube/k0s-ctk.Dockerfile @@ -4,16 +4,19 @@ ARG BASE_NAMESPACE ARG BASE_IMG="atom" FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} AS runner +ARG K8S_VERSION + LABEL maintainer="haobibo@gmail.com" COPY work /opt/utils/ RUN set -eux && chmod +x /opt/utils/*.sh \ - && source /opt/utils/script-setup-k8s-common.sh && setup_verify_arch && setup_kubectl && setup_helm && setup_k9s \ - && source /opt/utils/script-setup-k0s.sh && setup_k0s && setup_k0s_pack \ + && source /opt/utils/script-setup-k8s-common.sh && setup_verify_arch && setup_helm && setup_k9s \ + && source /opt/utils/script-setup-k0s.sh \ + && setup_k0s "${K8S_VERSION:+${K8S_VERSION}+k0s.0}" && setup_k0s_pack "${K8S_VERSION:+${K8S_VERSION}+k0s.0}" && setup_kubectl "${K8S_VERSION}" \ + ## zstd -T0 --ultra -22 --rm /opt/k0s/*.tar \ ## skip due to very low compression rate && mv /opt/k8s/* /opt/k0s/ \ && mv /opt/utils/script-setup-k0s.sh /opt/k0s/ \ - && rm -rf /opt/k8s && ls -alh /opt/* diff --git a/docker_kube/k3s-ctk.Dockerfile b/docker_kube/k3s-ctk.Dockerfile index 317a493..aa464c7 100644 --- a/docker_kube/k3s-ctk.Dockerfile +++ b/docker_kube/k3s-ctk.Dockerfile @@ -4,13 +4,16 @@ ARG BASE_NAMESPACE ARG BASE_IMG="atom" FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} AS runner +ARG K8S_VERSION + LABEL maintainer="haobibo@gmail.com" COPY work /opt/utils/ RUN set -eux && chmod +x /opt/utils/*.sh \ - && source /opt/utils/script-setup-k8s-common.sh && setup_verify_arch && setup_kubectl && setup_helm && setup_k9s \ - && source /opt/utils/script-setup-k3s.sh && setup_k3s && setup_k3s_pack \ + && source /opt/utils/script-setup-k8s-common.sh && setup_verify_arch && setup_helm && setup_k9s \ + && source /opt/utils/script-setup-k3s.sh \ + && setup_k3s "${K8S_VERSION}" && setup_k3s_pack "${K8S_VERSION}" && setup_kubectl "${K8S_VERSION}" \ && mv /opt/k8s/* /opt/k3s/ \ && mv /opt/utils/script-setup-k3s.sh /opt/utils/script-get-k3s-io.sh /opt/k3s/ \ && rm -rf /opt/k8s && ls -alh /opt/* diff --git a/tool.sh b/tool.sh index eb59a99..51d5c3d 100644 --- a/tool.sh +++ b/tool.sh @@ -1,8 +1,18 @@ #!/bin/bash -set -eux +if [ "${GITHUB_ACTIONS:-"false"}" != "true" ]; then + export CI_PROJECT_BRANCH=$(git branch --show-current) CI_PROJECT_NAME=LabNow/lab-container-kit + export REGISTRY_SRC=quay.io REGISTRY_DST=quay.io + echo "Not running in GitHub Action." +else + set -exu + export CI_PROJECT_BRANCH=${GITHUB_HEAD_REF:-$GITHUB_REF_NAME} CI_PROJECT_NAME=${CI_PROJECT_NAME:-$GITHUB_REPOSITORY} + echo "Running in GitHub Actions and Setup Env:" + [ ! -f /etc/docker/daemon.json ] && sudo tee /etc/docker/daemon.json > /dev/null <<< '{}' ; + jq '.experimental=true | ."data-root"="/mnt/docker"' /etc/docker/daemon.json > /tmp/daemon.json && sudo mv /tmp/daemon.json /etc/docker/ ; + ( sudo service docker restart || true ) && cat /etc/docker/daemon.json && docker info ; +fi + -CI_PROJECT_NAME=${CI_PROJECT_NAME:-$GITHUB_REPOSITORY} -CI_PROJECT_BRANCH=${GITHUB_HEAD_REF:-"main"} CI_PROJECT_SPACE=$(echo "${CI_PROJECT_BRANCH}" | cut -f1 -d'/') # If on the main branch, image namespace will be same as CI_PROJECT_NAME's name space; @@ -11,7 +21,7 @@ CI_PROJECT_SPACE=$(echo "${CI_PROJECT_BRANCH}" | cut -f1 -d'/') export CI_PROJECT_NAMESPACE="$(dirname ${CI_PROJECT_NAME})${NAMESPACE_SUFFIX}" ; export IMG_NAMESPACE=$(echo "${CI_PROJECT_NAMESPACE}" | awk '{print tolower($0)}') -export IMG_PREFIX_SRC=$(echo "${REGISTRY_SRC:-"docker.io"}/${IMG_NAMESPACE}" | awk '{print tolower($0)}') +export IMG_PREFIX_SRC=$(echo "${REGISTRY_SRC:-"quay.io"}/${IMG_NAMESPACE}" | awk '{print tolower($0)}') export IMG_PREFIX_DST=$(echo "${REGISTRY_DST:-"docker.io"}/${IMG_NAMESPACE}" | awk '{print tolower($0)}') export TAG_SUFFIX="-$(git rev-parse --short HEAD)" @@ -25,7 +35,9 @@ echo "--------> DOCKER_TAG_SUFFIX=${TAG_SUFFIX}" build_image() { echo "$@" ; IMG=$1; TAG=$2; FILE=$3; shift 3; VER=$(date +%Y.%m%d.%H%M)${TAG_SUFFIX}; WORKDIR="$(dirname $FILE)"; - docker build --compress --force-rm=true -t "${IMG_PREFIX_DST}/${IMG}:${TAG}" -f "$FILE" --build-arg "BASE_NAMESPACE=${IMG_PREFIX_SRC}" "$@" "${WORKDIR}" + BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 \ + docker build --compress --force-rm=true -t "${IMG_PREFIX_DST}/${IMG}:${TAG}" -f "$FILE" \ + --build-arg "BASE_NAMESPACE=${IMG_PREFIX_SRC}" "$@" "${WORKDIR}" docker tag "${IMG_PREFIX_DST}/${IMG}:${TAG}" "${IMG_PREFIX_DST}/${IMG}:${VER}" echo "${IMG_PREFIX_DST}/${IMG}:${TAG}" } @@ -33,7 +45,9 @@ build_image() { build_image_no_tag() { echo "$@" ; IMG=$1; TAG=$2; FILE=$3; shift 3; WORKDIR="$(dirname $FILE)"; - docker build --compress --force-rm=true -t "${IMG_PREFIX_DST}/${IMG}:${TAG}" -f "$FILE" --build-arg "BASE_NAMESPACE=${IMG_PREFIX_SRC}" "$@" "${WORKDIR}" + BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 \ + docker build --compress --force-rm=true -t "${IMG_PREFIX_DST}/${IMG}:${TAG}" -f "$FILE" \ + --build-arg "BASE_NAMESPACE=${IMG_PREFIX_SRC}" "$@" "${WORKDIR}" echo "${IMG_PREFIX_DST}/${IMG}:${TAG}" } @@ -85,10 +99,3 @@ free_diskspace() { remove_folder /usr/share/dotnet ; # /usr/local/lib/android /var/lib/docker df -h ; } - -setup_github_actions() { - [ ! -f /etc/docker/daemon.json ] && sudo tee /etc/docker/daemon.json > /dev/null <<< '{}' ; - jq '.experimental=true | ."data-root"="/mnt/docker"' /etc/docker/daemon.json > /tmp/daemon.json && sudo mv /tmp/daemon.json /etc/docker/ ; - ( sudo service docker restart || true ) && cat /etc/docker/daemon.json && docker info ; -} -[ "$GITHUB_ACTIONS" = "true" ] && echo "Running in GitHub Actions and Setup Env: $(setup_github_actions)" From c638fbe4e054d2aa6bb891828e876780cf8a84ee Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 22:28:24 +0000 Subject: [PATCH 06/10] typo --- .github/workflows/build-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 67dc82e..c44c768 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -37,7 +37,7 @@ jobs: - run: | source ./tool.sh && K8S_VERSION=1.37.1 build_image_no_tag k3s-ctk latest docker_kube/k3s-ctk.Dockerfile --build-arg K8S_VERSION=${K8S_VERSION} - alias_image k3s-ctk latest k3s-ctk:${K8S_VERSION} + alias_image k3s-ctk latest k3s-ctk ${K8S_VERSION} push_image ${K8S_VERSION} job-k0s-ctk: @@ -48,7 +48,7 @@ jobs: - run: | source ./tool.sh && K8S_VERSION=1.37.1 build_image_no_tag k0s-ctk latest docker_kube/k0s-ctk.Dockerfile --build-arg K8S_VERSION=${K8S_VERSION} - alias_image k0s-ctk latest k0s-ctk:${K8S_VERSION} + alias_image k0s-ctk latest k0s-ctk ${K8S_VERSION} push_image ${K8S_VERSION} From 1bffe26b967fe5a6c7ec3dfce316977f35c29172 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 22:59:30 +0000 Subject: [PATCH 07/10] restore cri-dockerd --- docker_kube/README.md | 15 ++++--- docker_kube/work/script-setup-k0s.sh | 66 ++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/docker_kube/README.md b/docker_kube/README.md index 2c83749..30c33bd 100644 --- a/docker_kube/README.md +++ b/docker_kube/README.md @@ -99,7 +99,7 @@ cd /opt/k0s # (Optional) Link binaries to PATH sudo ln -sf /opt/k0s/k* /opt/k0s/helm /usr/local/bin/ -# Copy the air-gap bundle to the designated directory +# Load the docker images in the air-gap bundle sudo mkdir -p /var/lib/k0s/images/ sudo cat ./k0s-airgap-bundle-* | docker load sudo rm -f ./k0s-airgap-bundle-* @@ -107,6 +107,9 @@ sudo rm -f ./k0s-airgap-bundle-* #### 3. Install and start K0s service ```bash +# Setup cri-dockerd for k0s to use docker daemon +create_cri_dockerd_unit_files + # Install as a single-node controller + worker sudo k0s install controller --single --enable-worker @@ -116,15 +119,17 @@ sudo k0s start #### 4. (Optional) Manually start k0s without systemd ```bash -sudo k0s controller --single --enable-worker -v +sudo /opt/k0s/cri-dockerd \ + --docker-endpoint=unix:///var/run/docker.sock \ + --container-runtime-endpoint=unix:///run/cri-dockerd.sock + +sudo k0s controller --single --enable-worker \ + --cri-socket=remote:unix:///run/cri-dockerd.sock -v ``` #### 5. Verify installation ```bash sudo k0s status -sudo k0s kubectl get nodes - - mkdir -pv ~/.kube sudo k0s kubeconfig admin > ~/.kube/config diff --git a/docker_kube/work/script-setup-k0s.sh b/docker_kube/work/script-setup-k0s.sh index aeff023..998041f 100644 --- a/docker_kube/work/script-setup-k0s.sh +++ b/docker_kube/work/script-setup-k0s.sh @@ -31,3 +31,69 @@ setup_k0s_pack() { && echo "Downloading k0s airgap images version ${VER_K0S} from ${URL_K0S_IMG}" \ && curl -L -o "/opt/k0s/k0s-airgap-bundle-${VER_K0S}-linux-${ARCH}.tar" "${URL_K0S_IMG}" } + + +setup_cri_dockerd() { + # Install the latest release: https://mirantis.github.io/cri-dockerd/usage/install-manually/ + VER_CRI_DOCKERD=$(curl -sL https://github.com/Mirantis/cri-dockerd/releases.atom | grep 'releases/tag/v' | grep -v 'rc' | head -1 | grep -Po '\d[\d.]+' ) \ + && URL_CRI_DOCKERD="https://github.com/Mirantis/cri-dockerd/releases/download/v$VER_CRI_DOCKERD/cri-dockerd-$VER_CRI_DOCKERD.$ARCH.tgz" \ + && echo "Downloading cri-dockerd version ${VER_CRI_DOCKERD} from: ${URL_CRI_DOCKERD}" \ + && mkdir -pv /opt/k0s && curl -L -o /tmp/cri-dockerd.tgz $URL_CRI_DOCKERD \ + && tar -xzvf /tmp/cri-dockerd.tgz -C /opt/k0s/ --strip-components=1 cri-dockerd/cri-dockerd \ + && chmod +x /opt/k0s/cri-dockerd + /opt/k0s/cri-dockerd --version +} + + +create_cri_dockerd_unit_files() { + local SYSTEMD_DIR="/etc/systemd/system" + local FILE_SOCKET="${SYSTEMD_DIR}/cri-docker.socket" + local FILE_SERVICE="${SYSTEMD_DIR}/cri-docker.service" + + echo "Creating ${FILE_SOCKET} and ${FILE_SERVICE} ..." + + sudo tee "${FILE_SOCKET}" >/dev/null <<'EOF' +[Unit] +Description=CRI Docker Socket for the API +PartOf=cri-docker.service + +[Socket] +ListenStream=/var/run/cri-dockerd.sock +SocketMode=0660 +SocketUser=root +SocketGroup=docker + +[Install] +WantedBy=sockets.target +EOF + + sudo tee "${FILE_SERVICE}" >/dev/null <<'EOF' +[Unit] +Description=CRI Interface for Docker Application Container Engine +Documentation=https://docs.mirantis.com +After=network-online.target firewalld.service docker.service +Wants=network-online.target +Requires=cri-docker.socket + +[Service] +Type=notify +ExecStart=/opt/k0s/cri-dockerd --container-runtime-endpoint fd:// +ExecReload=/bin/kill -s HUP $MAINPID +TimeoutSec=0 +RestartSec=2 +Restart=always +StartLimitBurst=3 +StartLimitInterval=60s +LimitNOFILE=infinity +LimitNPROC=infinity +LimitCORE=infinity + +# Comment TasksMax if your systemd version does not support it. +TasksMax=infinity +Delegate=yes +KillMode=process + +[Install] +WantedBy=multi-user.target +EOF +} From ff62aac06cdb759b8cc116ff01f34f4d35e1bbba Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 23:07:36 +0000 Subject: [PATCH 08/10] docs updates --- docker_kube/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker_kube/README.md b/docker_kube/README.md index 30c33bd..cfcb674 100644 --- a/docker_kube/README.md +++ b/docker_kube/README.md @@ -21,10 +21,11 @@ The tools and files included in each container image: | Component Role | `k3s-ctk` Image | `k0s-ctk` Image | Description | | :--- | :--- | :--- | :--- | | **Kubernetes Engine** | `k3s` | `k0s` | The core Kubernetes distribution binary. | -| **Air-gap Image Bundle** | `k3s-airgap-images-*.tar.zst` | `k0s-airgap-bundle-*` | System container images bundle for offline deployment. | +| **Air-gap Image Bundle** | `k3s-airgap-images-*.tar.zst` | `k0s-airgap-bundle-*.tar` | System container images bundle for offline deployment. | | **Kubernetes CLI** | `kubectl` | `kubectl` | Command-line tool for control plane operations. | | **Package Manager** | `helm` | `helm` | Tool for managing Kubernetes pre-packaged charts. | -| **Official Installer** | `script-get-k3s-io.sh` | *N/A* | Official installation script (embedded in K0s). | +| **CRI Adapter** | (embedded in k3s) | `cri-dockerd` | Adapter to use Docker as the container runtime. | +| **Official Installer** | `script-get-k3s-io.sh` | (embedded in k0s) | Official installation script. | | **Setup Helper Script** | `script-setup-k3s.sh` | `script-setup-k0s.sh` | Scripts containing functions for configuration and setup. | --- From 9e68b729c0e2cec0d2fac60ca7e7f8390387c817 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 23:14:37 +0000 Subject: [PATCH 09/10] doc updates --- docker_kube/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker_kube/README.md b/docker_kube/README.md index cfcb674..45a4f14 100644 --- a/docker_kube/README.md +++ b/docker_kube/README.md @@ -97,19 +97,19 @@ K0s loads offline images from `/var/lib/k0s/images/` by default. ```bash cd /opt/k0s -# (Optional) Link binaries to PATH -sudo ln -sf /opt/k0s/k* /opt/k0s/helm /usr/local/bin/ - # Load the docker images in the air-gap bundle sudo mkdir -p /var/lib/k0s/images/ sudo cat ./k0s-airgap-bundle-* | docker load sudo rm -f ./k0s-airgap-bundle-* + +# (Optional) Link binaries to PATH +sudo ln -sf /opt/k0s/k* /opt/k0s/helm /usr/local/bin/ ``` #### 3. Install and start K0s service ```bash -# Setup cri-dockerd for k0s to use docker daemon -create_cri_dockerd_unit_files +# (Optional) Setup cri-dockerd for k0s to use docker daemon instead of containerd as runtime +source ./script-setup-k0s.sh && create_cri_dockerd_unit_files # Install as a single-node controller + worker sudo k0s install controller --single --enable-worker From 7c4d49ed4ea94e9d21fe665848386afa27547dfe Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sat, 31 Oct 2026 23:16:13 +0000 Subject: [PATCH 10/10] ci env --- .github/workflows/build-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index c44c768..96b2f81 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -17,7 +17,7 @@ permissions: contents: read env: - BUILDKIT_PROGRESS: "plain" # Full logs for CI build. + TZ: Asia/Shanghai REGISTRY_SRC: ${{ vars.REGISTRY_SRC || 'quay.io' }} # For BASE_NAMESPACE of images: where to pull base images from, docker.io or other source registry URL. REGISTRY_DST: ${{ vars.REGISTRY_DST || 'quay.io' }} # For tags of built images: where to push images to, docker.io or other destination registry URL. # DOCKER_REGISTRY_USERNAME and DOCKER_REGISTRY_PASSWORD is required for docker image push, they should be set in CI secrets.