Adapted variables

madic-creates · Sep 29, 2024 · 208aaa9 · 208aaa9
1 parent aa1ff91
commit 208aaa9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/ansible/vars/main.yaml b/ansible/vars/main.yaml
@@ -25,7 +25,10 @@ K3S_WORKER_CONFIG:
 #--flannel-backend 'wireguard-native'
 #--flannel-iface 'wg0'
 
-K3S_K9S_VERSION: v0.27.4
+# https://github.com/derailed/k9s/releases
+K3S_K9S_VERSION: v0.32.4
+
+K3S_DEPLOY_ARGOCD: false
 
 K3S_REGISTRIES:
   - name: registries.yaml
@@ -52,7 +55,7 @@ K3S_KUBELET:
 ## KubeVIP
 ### https://kube-vip.io/
 ### https://github.com/kube-vip/kube-vip/releases
-K3S_KUBEVIP_VERSION: v0.6.0
+K3S_KUBEVIP_VERSION: v0.7.2
 K3S_KUBEVIP_ARGS: >-
   vip
   /kube-vip

diff --git a/ansible/vars/own.yaml b/ansible/vars/own.yaml
@@ -31,12 +31,12 @@ K3S_WORKER_CONFIG:
       resolv-conf: "/run/systemd/resolve/resolv.conf"
       embedded-registry: true
 
-K3S_DEPLOY_ARGOCD: true
-
 #--flannel-backend 'wireguard-native'
 #--flannel-iface 'wg0'
 
-K3S_K9S_VERSION: v0.27.4
+K3S_K9S_VERSION: v0.32.4
+
+K3S_DEPLOY_ARGOCD: true
 
 K3S_REGISTRIES:
   - name: registries.yaml

diff --git a/ansible/vars/vagrant.yaml b/ansible/vars/vagrant.yaml
@@ -2,22 +2,25 @@
 K3S_IP_ADDRESS: 192.168.33.11
 #K3S_VIP: 192.168.33.9
 K3S_TOKEN: VAGRANT
-K3S_SERVER_ARGS: >-
-  server
-  --write-kubeconfig-mode '0644'
-  --disable 'servicelb'
-  --disable 'local-storage'
-  --kube-controller-manager-arg 'bind-address=0.0.0.0'
-  --kube-proxy-arg 'metrics-bind-address=0.0.0.0'
-  --kube-scheduler-arg 'bind-address=0.0.0.0'
-  --kubelet-arg 'config=/etc/rancher/k3s/kubelet.config'
-  --cluster-init
-
-K3S_WORKER_ARGS: >-
-  server
-  --kubelet-arg 'config=/etc/rancher/k3s/kubelet.config'
-  --disable 'servicelb'
-  --disable 'local-storage'
+K3S_SERVER_CONFIG:
+  - name: config.yaml
+    content: |
+      write-kubeconfig-mode: "0644"
+      disable:
+        - "servicelb"
+        - "local-storage"
+      kube-controller-manager-arg: "bind-address=0.0.0.0"
+      kube-proxy-arg: "metrics-bind-address=0.0.0.0"
+      kube-scheduler-arg: "bind-address=0.0.0.0"
+      kubelet-arg: "config=/etc/rancher/k3s/kubelet.config"
+      cluster-init: true
+K3S_WORKER_CONFIG:
+  - name: config.yaml
+    content: |
+      disable:
+        - "servicelb"
+        - "local-storage"
+      kubelet-arg: "config=/etc/rancher/k3s/kubelet.config"
 
 #--flannel-backend 'wireguard-native'
 #--flannel-iface 'wg0'