fix: k3s cluster

ryan4yin · Mar 17, 2024 · a070926 · a070926
1 parent 26ee648
commit a070926
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/hosts/k8s/k3s-prod-1-master-1/k3s.nix b/hosts/k8s/k3s-prod-1-master-1/k3s.nix
@@ -35,8 +35,9 @@ in {
       + " --kube-apiserver-arg='--allow-privileged=true'" # required by kubevirt
       + " --node-taint=CriticalAddonsOnly=true:NoExecute" # prevent workloads from running on the master
       + " --data-dir /var/lib/rancher/k3s"
-      + " --disable-helm-controller"
+      + " --disable-helm-controller" # we use fluxcd instead
+      + " --disable=traefik" # deploy our own ingress controller instead
       + " --etcd-expose-metrics true"
-      + ''--etcd-snapshot-schedule-cron "0 */12 * * *"'';
+      + " --etcd-snapshot-schedule-cron '0 */12 * * *'";
   };
 }
diff --git a/hosts/k8s/k3s-prod-1-master-2/k3s.nix b/hosts/k8s/k3s-prod-1-master-2/k3s.nix
@@ -23,8 +23,9 @@ in {
       + " --kube-apiserver-arg='--allow-privileged=true'" # required by kubevirt
       + " --node-taint=CriticalAddonsOnly=true:NoExecute" # prevent workloads from running on the master
       + " --data-dir /var/lib/rancher/k3s"
-      + " --disable-helm-controller"
+      + " --disable-helm-controller" # we use fluxcd instead
+      + " --disable=traefik" # deploy our own ingress controller instead
       + " --etcd-expose-metrics true"
-      + ''--etcd-snapshot-schedule-cron "0 */12 * * *"'';
+      + " --etcd-snapshot-schedule-cron '0 */12 * * *'";
   };
 }
diff --git a/hosts/k8s/k3s-prod-1-master-3/k3s.nix b/hosts/k8s/k3s-prod-1-master-3/k3s.nix
@@ -23,8 +23,9 @@ in {
       + " --kube-apiserver-arg='--allow-privileged=true'" # required by kubevirt
       + " --node-taint=CriticalAddonsOnly=true:NoExecute" # prevent workloads from running on the master
       + " --data-dir /var/lib/rancher/k3s"
-      + " --disable-helm-controller"
+      + " --disable-helm-controller" # we use fluxcd instead
+      + " --disable=traefik" # deploy our own ingress controller instead
       + " --etcd-expose-metrics true"
-      + ''--etcd-snapshot-schedule-cron "0 */12 * * *"'';
+      + " --etcd-snapshot-schedule-cron '0 */12 * * *'";
   };
 }
diff --git a/hosts/k8s/kubevirt-shoryu/k3s.nix b/hosts/k8s/kubevirt-shoryu/k3s.nix
@@ -34,8 +34,9 @@ in {
       + " --service-node-port-range 80-32767"
       + " --kube-apiserver-arg='--allow-privileged=true'" # required by kubevirt
       + " --data-dir /var/lib/rancher/k3s"
-      + " --disable-helm-controller"
+      + " --disable-helm-controller" # we use fluxcd instead
+      + " --disable=traefik" # deploy our own ingress controller instead
       + " --etcd-expose-metrics true"
-      + ''--etcd-snapshot-schedule-cron "0 */12 * * *"'';
+      + " --etcd-snapshot-schedule-cron '0 */12 * * *'";
   };
 }
diff --git a/hosts/k8s/kubevirt-shushou/k3s.nix b/hosts/k8s/kubevirt-shushou/k3s.nix
@@ -34,8 +34,9 @@ in {
       + " --service-node-port-range 80-32767"
       + " --kube-apiserver-arg='--allow-privileged=true'" # required by kubevirt
       + " --data-dir /var/lib/rancher/k3s"
-      + " --disable-helm-controller"
+      + " --disable-helm-controller" # we use fluxcd instead
+      + " --disable=traefik" # deploy our own ingress controller instead
       + " --etcd-expose-metrics true"
-      + ''--etcd-snapshot-schedule-cron "0 */12 * * *"'';
+      + " --etcd-snapshot-schedule-cron '0 */12 * * *'";
   };
 }
diff --git a/hosts/k8s/kubevirt-youko/k3s.nix b/hosts/k8s/kubevirt-youko/k3s.nix
@@ -34,8 +34,9 @@ in {
       + " --service-node-port-range 80-32767"
       + " --kube-apiserver-arg='--allow-privileged=true'" # required by kubevirt
       + " --data-dir /var/lib/rancher/k3s"
-      + " --disable-helm-controller"
+      + " --disable-helm-controller" # we use fluxcd instead
+      + " --disable=traefik" # deploy our own ingress controller instead
       + " --etcd-expose-metrics true"
-      + ''--etcd-snapshot-schedule-cron "0 */12 * * *"'';
+      + " --etcd-snapshot-schedule-cron '0 */12 * * *'";
   };
 }