From 149db6cd5620177b9f6b74e4b98f0739a2b7bbe5 Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Sat, 11 Jun 2022 10:21:46 +1000
Subject: [PATCH] Update home docker

---
 cluster.yaml      | 62 +++++++++++++++++++++++++++++++++++------------
 etcd.service      |  4 +--
 media/pihole.yaml |  2 ++
 recovery.sh       |  5 ++++
 4 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/cluster.yaml b/cluster.yaml
index c89e004..100dba6 100644
--- a/cluster.yaml
+++ b/cluster.yaml
@@ -1,21 +1,51 @@
 # Full configuration https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta2/
-apiVersion: kubeadm.k8s.io/v1beta2
-kind: ClusterConfiguration
+apiVersion: kubeadm.k8s.io/v1beta3
+bootstrapTokens:
+- groups:
+  - system:bootstrappers:kubeadm:default-node-token
+  token: 5kjlva.6y7tarecyrsnwn2c
+  ttl: 24h0m0s
+  usages:
+  - signing
+  - authentication
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 192.168.1.2
+  bindPort: 6443
+nodeRegistration:
+  criSocket: unix:///var/run/crio/crio.sock
+  imagePullPolicy: IfNotPresent
+  name: server-3
+  taints:
+  - effect: NoSchedule
+    key: node-role.kubernetes.io/master
+  - effect: NoSchedule
+    key: node-role.kubernetes.io/control-plane
+---
+apiServer:
+  timeoutForControlPlane: 4m0s
+apiVersion: kubeadm.k8s.io/v1beta3
+certificatesDir: /etc/kubernetes/pki
+clusterName: home-cluster
+controlPlaneEndpoint: 192.168.1.2:6443
+controllerManager: {}
+dns: {}
 etcd:
   external:
+    caFile: /etc/etcd/ca.pem
+    certFile: /etc/etcd/etcd.pem
     endpoints:
-      - "https://192.168.1.22:2379"
-      - "https://192.168.1.2:2379"
-      - "https://192.168.1.11:2379"
-      - "https://192.168.1.111:2379"
-    caFile: "/etc/etcd/ca.pem"
-    certFile: "/etc/etcd/etcd.pem"
-    keyFile: "/etc/etcd/etcd-key.pem"
+    - https://192.168.1.9:2379
+    - https://192.168.1.10:2379
+    - https://192.168.1.11:2379
+    - https://192.168.1.111:2379
+    - https://192.168.1.2:2379
+    keyFile: /etc/etcd/etcd-key.pem
+imageRepository: k8s.gcr.io
+kind: ClusterConfiguration
+kubernetesVersion: v1.24.1
 networking:
-  serviceSubnet: "10.96.0.0/16"
-  podSubnet: "10.244.0.0/16"
-  dnsDomain: "cluster.local"
-controlPlaneEndpoint: "192.168.1.2:6443" # updated to this vip
-certificatesDir: "/etc/kubernetes/pki"
-imageRepository: "k8s.gcr.io"
-clusterName: "home-cluster"
+  dnsDomain: cluster.local
+  podSubnet: 10.244.0.0/16
+  serviceSubnet: 10.96.0.0/12
+scheduler: {}
diff --git a/etcd.service b/etcd.service
index 6dbc08c..b51b49b 100644
--- a/etcd.service
+++ b/etcd.service
@@ -21,8 +21,8 @@ ExecStart=/usr/local/bin/etcd \\
   --listen-client-urls https://${INTERNAL_IP}:2379,https://127.0.0.1:2379 \\
   --advertise-client-urls https://${INTERNAL_IP}:2379 \\
   --initial-cluster-token etcd-cluster-0 \\
-  --initial-cluster ssd-3=https://192.168.1.22:2380,plex=https://192.168.1.11:2380,ssd-server-1=https://192.168.1.111:2380 \\
-  --initial-cluster-state new \\
+  --initial-cluster server-3=https://192.168.1.2:2380,ssd-server-1=https://192.168.1.111:2380,ssd-server-3=https://192.168.1.9:2380 \\
+  --initial-cluster-state existing \\
   --data-dir=/var/lib/etcd
 Restart=on-failure
 RestartSec=5
diff --git a/media/pihole.yaml b/media/pihole.yaml
index 2fce643..0ffea4d 100644
--- a/media/pihole.yaml
+++ b/media/pihole.yaml
@@ -51,6 +51,8 @@ spec:
                   key: webpassword
             - name: DNS1
               value: '1.1.1.1'
+            - name: DNSMASQ_USER
+              value: 'root'
             - name: DNS2
               value: '8.8.8.8'
             - name: VIRTUAL_HOST
diff --git a/recovery.sh b/recovery.sh
index 1264be8..010fb4c 100644
--- a/recovery.sh
+++ b/recovery.sh
@@ -118,3 +118,8 @@ sudo kubeadm upgrade plan --config cluster.yaml --v=5
 
 # apply
 sudo kubeadm upgrade apply --config cluster.yaml --ignore-preflight-errors all --v=5
+
+
+# kubelet options
+
+sudo vim /var/lib/kubelet/kubeadm-flags.env