From 0ec63761d0d30bdfb1a78a0d21f4784a363e222d Mon Sep 17 00:00:00 2001 From: shou shirakawa Date: Thu, 17 Aug 2023 23:33:57 +0000 Subject: [PATCH 1/3] version up --- vagrant-provisioning/Vagrantfile | 6 +++--- vagrant-provisioning/bootstrap.sh | 4 +++- vagrant-provisioning/bootstrap_kmaster.sh | 4 +++- vagrant-provisioning/bootstrap_kworker.sh | 2 ++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/vagrant-provisioning/Vagrantfile b/vagrant-provisioning/Vagrantfile index 66ab98982e1..afa3f97a2cf 100644 --- a/vagrant-provisioning/Vagrantfile +++ b/vagrant-provisioning/Vagrantfile @@ -4,11 +4,11 @@ ENV['VAGRANT_NO_PARALLEL'] = 'yes' VAGRANT_BOX = "generic/ubuntu2204" -VAGRANT_BOX_VERSION = "4.2.10" +VAGRANT_BOX_VERSION = "4.2.16" CPUS_MASTER_NODE = 2 CPUS_WORKER_NODE = 1 -MEMORY_MASTER_NODE = 2048 -MEMORY_WORKER_NODE = 1024 +MEMORY_MASTER_NODE = 4096 +MEMORY_WORKER_NODE = 2048 WORKER_NODES_COUNT = 2 diff --git a/vagrant-provisioning/bootstrap.sh b/vagrant-provisioning/bootstrap.sh index 671071f5651..3704e7ec60c 100644 --- a/vagrant-provisioning/bootstrap.sh +++ b/vagrant-provisioning/bootstrap.sh @@ -49,7 +49,7 @@ curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - >/ apt-add-repository "deb http://apt.kubernetes.io/ kubernetes-xenial main" >/dev/null 2>&1 echo "[TASK 7] Install Kubernetes components (kubeadm, kubelet and kubectl)" -apt install -qq -y kubeadm=1.26.0-00 kubelet=1.26.0-00 kubectl=1.26.0-00 >/dev/null 2>&1 +apt install -qq -y kubeadm=1.28.0-00 kubelet=1.28.0-00 kubectl=1.28.0-00 >/dev/null 2>&1 echo "[TASK 8] Enable ssh password authentication" sed -i 's/^PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config @@ -66,3 +66,5 @@ cat >>/etc/hosts<> /root/kubeinit.log 2>/dev/null echo "[TASK 3] Deploy Calico network" -kubectl --kubeconfig=/etc/kubernetes/admin.conf create -f https://docs.projectcalico.org/v3.18/manifests/calico.yaml >/dev/null 2>&1 +kubectl --kubeconfig=/etc/kubernetes/admin.conf create -f https://docs.projectcalico.org/v3.26/manifests/calico.yaml >/dev/null 2>&1 echo "[TASK 4] Generate and save cluster join command to /joincluster.sh" kubeadm token create --print-join-command > /joincluster.sh 2>/dev/null + +#eof diff --git a/vagrant-provisioning/bootstrap_kworker.sh b/vagrant-provisioning/bootstrap_kworker.sh index a32640c7a0f..de82671af7f 100644 --- a/vagrant-provisioning/bootstrap_kworker.sh +++ b/vagrant-provisioning/bootstrap_kworker.sh @@ -4,3 +4,5 @@ echo "[TASK 1] Join node to Kubernetes Cluster" apt install -qq -y sshpass >/dev/null 2>&1 sshpass -p "kubeadmin" scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no kmaster.example.com:/joincluster.sh /joincluster.sh 2>/dev/null bash /joincluster.sh >/dev/null 2>&1 + +#eof From f31594188b644168335febc8ae433baae95f1b4e Mon Sep 17 00:00:00 2001 From: shou shirakawa Date: Thu, 17 Aug 2023 23:54:10 +0000 Subject: [PATCH 2/3] bugfix for 3.26 calico config not exist --- vagrant-provisioning/bootstrap_kmaster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant-provisioning/bootstrap_kmaster.sh b/vagrant-provisioning/bootstrap_kmaster.sh index e604ddfaab6..2e3e0f4316f 100644 --- a/vagrant-provisioning/bootstrap_kmaster.sh +++ b/vagrant-provisioning/bootstrap_kmaster.sh @@ -7,7 +7,7 @@ echo "[TASK 2] Initialize Kubernetes Cluster" kubeadm init --apiserver-advertise-address=172.16.16.100 --pod-network-cidr=192.168.0.0/16 >> /root/kubeinit.log 2>/dev/null echo "[TASK 3] Deploy Calico network" -kubectl --kubeconfig=/etc/kubernetes/admin.conf create -f https://docs.projectcalico.org/v3.26/manifests/calico.yaml >/dev/null 2>&1 +kubectl --kubeconfig=/etc/kubernetes/admin.conf create -f https://docs.projectcalico.org/v3.25/manifests/calico.yaml >/dev/null 2>&1 echo "[TASK 4] Generate and save cluster join command to /joincluster.sh" kubeadm token create --print-join-command > /joincluster.sh 2>/dev/null From 7586c439d03c3200005de66ed15cfb4f2c8eeb07 Mon Sep 17 00:00:00 2001 From: shou333 <139409465+shou333@users.noreply.github.com> Date: Mon, 9 Jun 2025 09:11:23 +0900 Subject: [PATCH 3/3] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 529b50b0741..9927655fe66 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # kubernetes Kubernetes playground + +# just test for tidb serverless branches