updating cluster specs

abasitt · Jan 1, 2024 · 2a042c9 · 2a042c9
1 parent f6285b0
commit 2a042c9
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 22 deletions.
diff --git a/infrastructure/ansible/inventory/group_vars/kubernetes/supplemental.yml b/infrastructure/ansible/inventory/group_vars/kubernetes/supplemental.yml
@@ -1,6 +1,6 @@
 ---
 timezone: "Asia/Singapore"
-kubevip_address: "192.168.30.10"
+kubevip_address: "192.168.30.50"
 cluster_cidr: "10.42.0.0/16"
 cluster_v6cidr: "2001:470:ee86:1042::/56"
 service_cidr: "10.43.0.0/16"

diff --git a/infrastructure/ansible/inventory/host_vars/k3s-m1.sops.yml b/infrastructure/ansible/inventory/host_vars/k3s-m1.sops.yml
@@ -1,6 +1,6 @@
 kind: ENC[AES256_GCM,data:2b/B00ki,iv:CGG7GODgYUIOaLQuTYGtav4bYxia0kJXj6sHc66astw=,tag:UNdFWEb1LDs8Hit9EPWqNA==,type:str]
-ansible_user: ENC[AES256_GCM,data:MDar1248,iv:s59cKpalWwKZKqda4QTu6PC7wAI5JyjhQ2H1hBpUgko=,tag:n/14p1nD3djr0l+hQ+zokw==,type:str]
-ansible_become_pass: ENC[AES256_GCM,data:/WrMvLkR34Fcq/NW,iv:Q/hOTktoXbSTA9YP3269By29ZnNjthKZL+bAfNU12/4=,tag:WSepcava9jH7Y/nmBymM7A==,type:str]
+ansible_user: ENC[AES256_GCM,data:/Ws5,iv:LWlPvEbpb0aUsXD1ukn5PQqf/zdgzCUllKOPEkTkXnM=,tag:nigXAaHN3uFrhHudcccnBg==,type:str]
+ansible_become_pass: ENC[AES256_GCM,data:ej6iDwczmAY=,iv:Dapa8HPHXtnBhGnGRTkgT3I8ZzNPQenNaAxgLT948gM=,tag:c3NXn3SVtV70TNMDkyPVGg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -16,8 +16,8 @@ sops:
             VnZKQS9ZaG5xQ0toRSt1a21VdjE2N0kK/hg1IE+0RRTQd/xKvHZWCZSc6QP2NeiB
             b4eU7LVm2nOHSmS6AEG5czGh/MCOAgwlmmTI7jALZCAElVRdCqyhCw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-06-04T11:50:55Z"
-    mac: ENC[AES256_GCM,data:QIwrNXoc13MJxL9xgm2e9qdAO4BWL9r5x0R66hqFTLvXwX6HEkbBqu+oA4zrkvaoWnmbIlkl0AiRuoZPRscZxiRRu4ElXFh0gCnupQQDkK0u0GoC0GDwUGyzEBRV9XnDY8Meyq2GMnCxfILXtNQHgurlcAAJSm8/729q7m++vjQ=,iv:HrjkvIPbHAGouO9XVRe/NJYaWxmJpxc57/JtOpa9y4M=,tag:ge2Ao2EuL8srOTVj0deKTA==,type:str]
+    lastmodified: "2024-01-01T08:11:43Z"
+    mac: ENC[AES256_GCM,data:EAVDl6aLeZ7hzXnzU0ca+5UiPeyd7jmjgY08vXOSClk2kdytUuVe5Eg5uZEQybumctP2KTzy0oAW1J1lCIXFHHyvYOLotcxaBTP8qzSMrekHMhyCnJCRZ9JWN+yocP9NQjwvIX6BLxmKZQXD+7+rQ38tFe3aGBEPMiFPMMUAMHE=,iv:TKrf20yZROpwPFmoo0OYhsub3La/YwLRUu0jqa7rCaE=,tag:TWn834yuies6r8L7EfTtcA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/infrastructure/ansible/inventory/host_vars/k3s-m2.sops.yml b/infrastructure/ansible/inventory/host_vars/k3s-m2.sops.yml
@@ -1,6 +1,6 @@
 kind: ENC[AES256_GCM,data:7V2kiokw,iv:B/YFfzEsONy5/+ms59yi++kQd0stK3buQ7a/RxYxU+o=,tag:caP2w1hKiEZ7lZ2XZ/UoHA==,type:str]
-ansible_user: ENC[AES256_GCM,data:m5DfnqLW,iv:fqwRjHqDchbDm2Tx4m0tZNgKmQCXh7kdUum7g121K2M=,tag:h+QQ7gR5kXhMydjGcRZgcg==,type:str]
-ansible_become_pass: ENC[AES256_GCM,data:TM5cBTE92BzqJVIg,iv:Jdi2OEeOu6siuvKvYm9QZPrpXAkSRGpy0crezZUDNNE=,tag:azsKdwvSQsEhdP08baCIfw==,type:str]
+ansible_user: ENC[AES256_GCM,data:ef6H,iv:YXyEpeBYFua54DS3Ugz/AfCFwKipeJBIehJz/hJzfLA=,tag:UVGRnvAODRK/b/U3IogpCg==,type:str]
+ansible_become_pass: ENC[AES256_GCM,data:Ak7Zpf7KRuo=,iv:4YHpxAdcgkn2RQgC2Y0klxxqJ9SWpqP4DKubfKNryyM=,tag:OHuL4KQd6tMOdK10vrdoMg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -16,8 +16,8 @@ sops:
             WndybHVtdDZoVzdCS1p4bnIvQ2N1MWsKJq6cIPFfVANK+vP80VeA0tJw8xFsQMat
             6bRzAQdBD4vdptEuXdVHe3gy4xUUdx9jiyaH/GsxFMzGkrGMtE1u2w==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-06-04T11:50:55Z"
-    mac: ENC[AES256_GCM,data:lw/Va4L8kyhILC6YhpNqfbLG+MXJUoDKZyH0EeW5vbstuoknd7cLRATwK07z7NQZB+1dLw87BknLLdf6C4g0yOpUKohasVGetGfTjwh9sNhNqW+O8HEUG4LoR3F0fn6mSruEFrMcZGkQhl6F5Zk8Z5PwNa4xXK7b18yNzh0MazY=,iv:j20pJDvgrilzboC5rB6r1R8nIRp/MN4mFgZFkT74Z5E=,tag:EJSMKCg7jBCmyjPOTN1R3g==,type:str]
+    lastmodified: "2024-01-01T08:12:08Z"
+    mac: ENC[AES256_GCM,data:TI0a42IXp4Ke0Cxhnm7vY4mLWZ1v7/nof9741Vho8pZZUugHtQu+JknWRENwSmD1yQlwBoRnHU1x5ppIkmcaFPvTyBGksGbOU+alASXx4d++oBdNi+68DllzjtNIyesw9L6JI5RVfDEIzfoG+W3t0U+yhX5oUf1EaqwqfNKP/5w=,iv:LBcIze5bN4LJeJ9X5QfWpxkNPmw0MkDnG7keJm07iKo=,tag:57ePGmpTphI4w+O7mffggQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/infrastructure/ansible/inventory/host_vars/k3s-m3.sops.yml b/infrastructure/ansible/inventory/host_vars/k3s-m3.sops.yml
@@ -1,6 +1,6 @@
 kind: ENC[AES256_GCM,data:We8V6ZPe,iv:Y7yH8SG8aVDaGmd7FHgF19WNApAeJ32K7laZ9WbTgtc=,tag:97FO/lJH04x4cmw+7IhNJw==,type:str]
-ansible_user: ENC[AES256_GCM,data:78tFM0sN,iv:fNkQPaqmPlZS3aTVnQkkTJW8YO+Bdfnak1bI25amTYM=,tag:L3dYbkvZNYgjlFjtBOaY+Q==,type:str]
-ansible_become_pass: ENC[AES256_GCM,data:JvAg4e6g2Vu6jj9L,iv:esl+HCtwZQX2aJrVUkLNxZknQHvcQBRupQSwTJQfIog=,tag:OCqls83S1eSukyEy/SFOMw==,type:str]
+ansible_user: ENC[AES256_GCM,data:EbT2,iv:tGzRYYPFEVF6e8ue5zjNhKM2IzhLL2kVeSLc4f1GTWw=,tag:4kH/AXLnkzdcbYkYH2t8QA==,type:str]
+ansible_become_pass: ENC[AES256_GCM,data:kNKCSchPW08=,iv:kY1BSYxFRLZy+MSDi5rqnDGQ4c6kDB/sRKi90BeUdAQ=,tag:hm+ggLjALQtUXoSug8/khw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -16,8 +16,8 @@ sops:
             V2NQVkZRSzBJYnRLVFRZL3BCQ3NHUEkKD/HRYnlUpoEQL6cgaKdq5Hxix3bH6GDA
             CTaoZ5IAqIVQBC4QepM/9OxsENPeDo4Rm2TsGlEhTXYbkGslGlgvSg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-06-04T11:50:55Z"
-    mac: ENC[AES256_GCM,data:3gHAcpZxzy0+YISFJ/nhgDC75/4+YKXEs0tWx9mXNOmUVArujGHx76HnZr9tzYmwE5reFcr8RklYGNvLszxzewIZw2J/CET0xP+l9iOmZQAe+C2B2pmB17jyFkiJC4FHeS45bGKTYxh6VVGqdGX6D2ktEXjXcQVoj/pYeajkCvk=,iv:JMibCzuLHsrb5DYy8M3M2pW3kwz00D7+iqdRz303u5o=,tag:Wv1xQOQAX/BWTh+hJJ46MQ==,type:str]
+    lastmodified: "2024-01-01T08:12:19Z"
+    mac: ENC[AES256_GCM,data:MikgkNkJbcvgAojF0Kkmys/fMhJ1FNEL9QnfbiQ7wRCzoNrLHu0TGVTZxpHR3AVnsf2w+dsP7/f+op321gGI0M4GYprzviE0xmb2f7rBXpxvsRRWV5SxxmeEZ4l4ngI51Z6rVxtt5O+bc9XFu0iA5alhaEbjd6WTVQrh7fy58MM=,iv:eryvm00IdbWsLTSD3U/fIgh3RdkDr5zJ6uoYgEkAKGA=,tag:tB48AmBCPICcKREvUhjU7w==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/infrastructure/ansible/inventory/hosts.yml b/infrastructure/ansible/inventory/hosts.yml
@@ -6,8 +6,14 @@ kubernetes:
         ansible_user: k8s
       hosts:
         k3s-m1:
-          ansible_host: 192.168.30.101
+          ansible_host: 192.168.30.21
+    #    k3s-m2:
+    #      ansible_host: 192.168.30.102
+    #    k3s-m3:
+    #      ansible_host: 192.168.30.103
+    worker:
+      vars:
+        ansible_user: k8s
+      hosts:
         k3s-m2:
-          ansible_host: 192.168.30.102
-        k3s-m3:
-          ansible_host: 192.168.30.103
+          ansible_host: 192.168.30.22
diff --git a/kubernetes/flux/vars/cluster-settings.yaml b/kubernetes/flux/vars/cluster-settings.yaml
@@ -6,11 +6,11 @@ metadata:
   namespace: flux-system
 data:
   TIMEZONE: "Asia/Singapore"
-  METALLB_LB_V4RANGE: "192.168.30.11-192.168.30.20"
-  METALLB_K8S_GATEWAY_V4ADDR: "192.168.30.11"
-  METALLB_INGRESS_V4ADDR: "192.168.30.12"
-  METALLB_ISTIOINGRESS_V4ADDR: "192.168.30.13"
-  KUBE_VIP_ADDR: "192.168.30.10"
+  METALLB_LB_V4RANGE: "192.168.30.41-192.168.30.49"
+  METALLB_K8S_GATEWAY_V4ADDR: "192.168.30.41"
+  METALLB_INGRESS_V4ADDR: "192.168.30.42"
+  METALLB_ISTIOINGRESS_V4ADDR: "192.168.30.43"
+  KUBE_VIP_ADDR: "192.168.30.50"
   CLUSTER_CIDR: "10.42.0.0/16"
   CLUSTER_V6CIDR: "2001:470:ee86:1042::/56"
   SERVICE_CIDR: "10.43.0.0/16"