From 8f9f6dae566826a1896e2e4828a6ee1ce304638b Mon Sep 17 00:00:00 2001
From: unchama <11990197+unchama@users.noreply.github.com>
Date: Mon, 4 Dec 2023 01:29:28 +0900
Subject: [PATCH 1/2] =?UTF-8?q?git=20clone=E3=81=AE=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cluster-boot-up/scripts/nodes/k8s-node-setup.sh         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 961fbcd5d..689894916 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
@@ -343,6 +343,9 @@ helm install cilium cilium/cilium \
 # Generate control plane certificate
 KUBEADM_UPLOADED_CERTS=$(kubeadm init phase upload-certs --upload-certs | tail -n 1)
 
+# clone repo
+git clone -b "${TARGET_BRANCH}" https://github.com/GiganticMinecraft/seichi_infra.git "$HOME"/seichi_infra
+
 # add join information to ansible hosts variable
 echo "kubeadm_bootstrap_token: $KUBEADM_BOOTSTRAP_TOKEN" >> "$HOME"/seichi_infra/seichi-onp-k8s/cluster-boot-up/ansible/hosts/k8s-servers/group_vars/all.yaml
 echo "kubeadm_uploaded_certs: $KUBEADM_UPLOADED_CERTS" >> "$HOME"/seichi_infra/seichi-onp-k8s/cluster-boot-up/ansible/hosts/k8s-servers/group_vars/all.yaml
@@ -350,9 +353,6 @@ echo "kubeadm_uploaded_certs: $KUBEADM_UPLOADED_CERTS" >> "$HOME"/seichi_infra/s
 # install ansible
 sudo apt-get install -y ansible git sshpass
 
-# clone repo
-git clone -b "${TARGET_BRANCH}" https://github.com/GiganticMinecraft/seichi_infra.git "$HOME"/seichi_infra
-
 # export ansible.cfg target
 export ANSIBLE_CONFIG="$HOME"/seichi_infra/seichi-onp-k8s/cluster-boot-up/ansible/ansible.cfg
 

From 235c46794d699a29828acc04191c155de9225b5a Mon Sep 17 00:00:00 2001
From: unchama <11990197+unchama@users.noreply.github.com>
Date: Mon, 4 Dec 2023 02:02:50 +0900
Subject: [PATCH 2/2] change node-ip to cluster-seg

---
 .../ansible/hosts/k8s-servers/group_vars/all.yaml           | 2 +-
 .../cluster-boot-up/scripts/nodes/k8s-node-setup.sh         | 6 +++---
 .../apps/cluster-wide-apps/app-of-other-apps/cilium.yaml    | 2 +-
 .../app-of-other-apps/prometheus-operator.yaml              | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/seichi-onp-k8s/cluster-boot-up/ansible/hosts/k8s-servers/group_vars/all.yaml b/seichi-onp-k8s/cluster-boot-up/ansible/hosts/k8s-servers/group_vars/all.yaml
index 03e870245..e219d09f3 100644
--- a/seichi-onp-k8s/cluster-boot-up/ansible/hosts/k8s-servers/group_vars/all.yaml
+++ b/seichi-onp-k8s/cluster-boot-up/ansible/hosts/k8s-servers/group_vars/all.yaml
@@ -2,4 +2,4 @@
 ansible_python_interpreter: /usr/bin/python3
 ansible_port: 22
 ansible_user: cloudinit
-kube_api_server_vip: 192.168.18.100
+kube_api_server_vip: 192.168.32.100
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 689894916..31ab700f0 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
@@ -29,9 +29,9 @@ esac
 
 # Set global variables
 TARGET_BRANCH=$2
-KUBE_API_SERVER_VIP=192.168.18.100
-VIP_INTERFACE=ens19
-NODE_IPS=( 192.168.18.11 192.168.18.12 192.168.18.13 )
+KUBE_API_SERVER_VIP=192.168.32.100
+VIP_INTERFACE=ens20
+NODE_IPS=( 192.168.32.11 192.168.32.12 192.168.32.13 )
 
 # set per-node variables
 case $1 in
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/cilium.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/cilium.yaml
index eacfa5fac..90398a2dd 100644
--- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/cilium.yaml
+++ b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/cilium.yaml
@@ -13,7 +13,7 @@ spec:
       releaseName: cilium
       values: |
         kubeProxyReplacement: strict
-        k8sServiceHost: 192.168.18.100 # modify it if necessary
+        k8sServiceHost: 192.168.32.100 # modify it if necessary
         k8sServicePort: 8443
         bgpControlPlane:
           enabled: true
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/prometheus-operator.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/prometheus-operator.yaml
index 2ce320ff0..d4f56485c 100644
--- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/prometheus-operator.yaml
+++ b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/prometheus-operator.yaml
@@ -136,9 +136,9 @@ spec:
           enabled: false
         kubeEtcd:
           endpoints:
-            - 192.168.18.11
-            - 192.168.18.12
-            - 192.168.18.13
+            - 192.168.32.11
+            - 192.168.32.12
+            - 192.168.32.13
           service:
             enabled: true
             port: 2381