Upgrade K8s to 1.26

GiganticMinecraft · Feb 24, 2023 · 7a5c27b · 7a5c27b
1 parent 8b4e086
commit 7a5c27b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/.github/workflows/pluto.yaml b/.github/workflows/pluto.yaml
@@ -19,8 +19,8 @@ jobs:
 
       - name: Use pluto
         run: |
-          pluto detect-files -d helm-charts/cloudflared-tunnel --target-versions k8s=v1.25.5
+          pluto detect-files -d helm-charts/cloudflared-tunnel --target-versions k8s=v1.26.1
 
       - name: Use pluto
         run: |
-          pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/apps --target-versions k8s=v1.25.5
+          pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/apps --target-versions k8s=v1.26.1
diff --git 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/9b6a9346371b8f2add3a786b6badbe4e13d4464c/seichi-onp-k8s/cluster-boot-scripts/deploy-vm.sh#L14-L19)。
 
 クラスタの作成は以下のツール群で行っています。
-  - kubeadm, kubectl, kubelet v1.25.5
+  - kubeadm, kubectl, kubelet v1.26.1
 
 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
@@ -117,7 +117,7 @@ sysctl --system
 curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
 echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
 apt-get update
-apt-get install -y kubelet=1.25.5-00 kubeadm=1.25.5-00 kubectl=1.25.5-00
+apt-get install -y kubelet=1.26.1-00 kubeadm=1.26.1-00 kubectl=1.26.1-00
 apt-mark hold kubelet kubeadm kubectl
 
 # Disable swap
@@ -275,16 +275,13 @@ bootstrapTokens:
   ttl: "24h"
 nodeRegistration:
   criSocket: "unix:///var/run/containerd/containerd.sock"
-  kubeletExtraArgs:
-    feature-gates: "DelegateFSGroupToCSIDriver=false"
 ---
 apiVersion: kubeadm.k8s.io/v1beta3
 kind: ClusterConfiguration
-imageRepository: "registry.k8s.io"
 networking:
   serviceSubnet: "10.96.0.0/16"
   podSubnet: "10.128.0.0/16"
-kubernetesVersion: "v1.25.5"
+kubernetesVersion: "v1.26.1"
 controlPlaneEndpoint: "${KUBE_API_SERVER_VIP}:8443"
 apiServer:
   certSANs:
@@ -297,19 +294,15 @@ apiServer:
   #   https://k8s-api.onp-k8s.admin.local-tunnels.seichi.click:PORT
   # where PORT is the port at which the local tunnel is running.
   - k8s-api.onp-k8s.admin.local-tunnels.seichi.click
-  extraArgs:
-    feature-gates: "DelegateFSGroupToCSIDriver=false"
 
 # expose these components so that we can get metrics
 # https://prometheus-operator.dev/docs/kube-prometheus-on-kubeadm/#kubeadm-pre-requisites
 controllerManager:
   extraArgs:
     bind-address: "0.0.0.0"
-    feature-gates: "DelegateFSGroupToCSIDriver=false"
 scheduler:
   extraArgs:
     bind-address: "0.0.0.0"
-    feature-gates: "DelegateFSGroupToCSIDriver=false"
 
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
@@ -350,9 +343,6 @@ apiVersion: kubeadm.k8s.io/v1beta3
 kind: JoinConfiguration
 nodeRegistration:
   criSocket: "unix:///var/run/containerd/containerd.sock"
-  kubeletExtraArgs:
-    feature-gates: "DelegateFSGroupToCSIDriver=false"
-    pod-infra-container-image: "registry.k8s.io/pause:3.5"
 discovery:
   bootstrapToken:
     apiServerEndpoint: "${KUBE_API_SERVER_VIP}:8443"
@@ -373,9 +363,6 @@ apiVersion: kubeadm.k8s.io/v1beta3
 kind: JoinConfiguration
 nodeRegistration:
   criSocket: "unix:///var/run/containerd/containerd.sock"
-  kubeletExtraArgs:
-    feature-gates: "DelegateFSGroupToCSIDriver=false"
-    pod-infra-container-image: "registry.k8s.io/pause:3.5"
 discovery:
   bootstrapToken:
     apiServerEndpoint: "${KUBE_API_SERVER_VIP}:8443"