From 12afee5ae24e644e1cfb5177cbd7e474fc613f7b Mon Sep 17 00:00:00 2001
From: outductor <inductor.kela+seichi@gmail.com>
Date: Mon, 30 Dec 2024 23:47:33 +0900
Subject: [PATCH] upgrade

---
 .github/workflows/pluto.yaml                   |  4 ++--
 seichi-onp-k8s/cluster-boot-up/README.md       |  2 +-
 .../scripts/nodes/k8s-node-setup.sh            | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pluto.yaml b/.github/workflows/pluto.yaml
index fb6cd99ab..515d4e37d 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.30.4
+          pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/apps --target-versions k8s=v1.32.0
 
       - name: Use pluto
         run: |
-          pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/app-templates --target-versions k8s=v1.30.4
+          pluto detect-files -d seichi-onp-k8s/manifests/seichi-kubernetes/app-templates --target-versions k8s=v1.32.0
diff --git a/seichi-onp-k8s/cluster-boot-up/README.md b/seichi-onp-k8s/cluster-boot-up/README.md
index 6679d7bbc..3ef13d581 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.30.4
+  - kubeadm, kubectl, kubelet v1.32.0
 
 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 a6e375946..18c18a946 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
@@ -126,9 +126,9 @@ EOF
 sysctl --system
 
 # Install kubeadm
-curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/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.30/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
-apt-get install -y kubeadm=1.30.4-1.1 kubectl=1.30.4-1.1 kubelet=1.30.4-1.1
+curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.32/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.32/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
+apt-get install -y kubeadm=1.32.0-1.1 kubectl=1.32.0-1.1 kubelet=1.32.0-1.1
 apt-mark hold kubelet kubectl
 
 # Disable swap
@@ -154,8 +154,8 @@ esac
 
 # Install HAProxy
 apt-get install -y --no-install-recommends software-properties-common
-add-apt-repository ppa:vbernat/haproxy-3.0 -y
-sudo apt-get install -y haproxy=3.0.\*
+add-apt-repository ppa:vbernat/haproxy-3.1 -y
+sudo apt-get install -y haproxy=3.1.\*
 
 cat > /etc/haproxy/haproxy.cfg <<EOF
 global
@@ -207,10 +207,10 @@ apt-get -y install keepalived
 
 cat > /etc/keepalived/keepalived.conf <<EOF
 # Define the script used to check if haproxy is still working
-vrrp_script chk_haproxy { 
+vrrp_script chk_haproxy {
     script "sudo /usr/bin/killall -0 haproxy"
-    interval 2 
-    weight 2 
+    interval 2
+    weight 2
 }
 
 # Configuration for Virtual Interface
@@ -307,7 +307,7 @@ etcd:
   local:
     extraArgs:
       listen-metrics-urls: http://0.0.0.0:2381
-kubernetesVersion: "v1.30.4"
+kubernetesVersion: "v1.32.0"
 controlPlaneEndpoint: "${KUBE_API_SERVER_VIP}:8443"
 apiServer:
   certSANs: