From 323c555d59b53a4252def5e691d8f067544e81bc Mon Sep 17 00:00:00 2001 From: outductor Date: Thu, 14 Dec 2023 22:08:32 +0900 Subject: [PATCH] update k8s version --- .github/workflows/pluto.yaml | 4 ++-- seichi-onp-k8s/cluster-boot-up/README.md | 2 +- .../cluster-boot-up/scripts/nodes/k8s-node-setup.sh | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pluto.yaml b/.github/workflows/pluto.yaml index ecabbc53b..58108e6c6 100644 --- a/.github/workflows/pluto.yaml +++ b/.github/workflows/pluto.yaml @@ -18,8 +18,8 @@ jobs: - name: Use pluto run: | - pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/apps --target-versions k8s=v1.27.8 + pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/apps --target-versions k8s=v1.28.4 - name: Use pluto run: | - pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/app-templates --target-versions k8s=v1.27.8 + pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/app-templates --target-versions k8s=v1.28.4 diff --git a/seichi-onp-k8s/cluster-boot-up/README.md b/seichi-onp-k8s/cluster-boot-up/README.md index db9112a86..16d6197e4 100644 --- a/seichi-onp-k8s/cluster-boot-up/README.md +++ b/seichi-onp-k8s/cluster-boot-up/README.md @@ -64,7 +64,7 @@ KubernetesノードのVMは cloudinit イメージで作成されています。 2022/05/23現在、クラスタは (3 control plane nodes + 3 worker nodes) の構成で[作成されています](https://github.com/GiganticMinecraft/seichi_infra/blob/91999d509e52905eaff16fc8928fbe5316f1eaeb/seichi-onp-k8s/cluster-boot-up/scripts/proxmox-host-terminal/deploy-vm.sh#L15-L20)。 クラスタの作成は以下のツール群で行っています。 - - kubeadm, kubectl, kubelet v1.27.8 + - kubeadm, kubectl, kubelet v1.28.4 CNI には Cilium を利用しています。 diff --git a/seichi-onp-k8s/cluster-boot-up/scripts/nodes/k8s-node-setup.sh b/seichi-onp-k8s/cluster-boot-up/scripts/nodes/k8s-node-setup.sh index d08ad2d71..a34be9123 100644 --- a/seichi-onp-k8s/cluster-boot-up/scripts/nodes/k8s-node-setup.sh +++ b/seichi-onp-k8s/cluster-boot-up/scripts/nodes/k8s-node-setup.sh @@ -91,7 +91,7 @@ sudo apt-get update && sudo apt-get install -y containerd.io # Configure containerd sudo mkdir -p /etc/containerd sudo containerd config default | sudo tee /etc/containerd/config.toml > /dev/null - +sudo sed -i 's#sandbox_image = "registry.k8s.io/pause:3.6"#sandbox_image = "registry.k8s.io/pause:3.9"#g' /etc/containerd/config.toml if grep -q "SystemdCgroup = true" "/etc/containerd/config.toml"; then echo "Config found, skip rewriting..." else @@ -115,10 +115,10 @@ EOF sysctl --system # Install kubeadm -curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg -echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list +curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg +echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.28/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list apt-get update -apt-get install -y kubeadm kubelet=1.27.8-1.1 kubectl=1.27.8-1.1 +apt-get install -y kubeadm=1.28.4-1.1 kubectl=1.28.4-1.1 kubelet=1.28.4-1.1 apt-mark hold kubelet kubectl # Disable swap @@ -297,7 +297,7 @@ etcd: local: extraArgs: listen-metrics-urls: http://0.0.0.0:2381 -kubernetesVersion: "v1.27.8" +kubernetesVersion: "v1.28.4" controlPlaneEndpoint: "${KUBE_API_SERVER_VIP}:8443" apiServer: certSANs: