feat: better organize talhelper patches

Signed-off-by: Devin Buhl <devin@buhl.casa>
onedr0p · Jan 6, 2025 · ce59515 · ce59515
1 parent 608d6ef
commit ce59515
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 34 deletions.
diff --git a/...ller/disable-admission-controller.yaml.j2 → ...roller/admission-controller-patch.yaml.j2 b/...ller/disable-admission-controller.yaml.j2 → ...roller/admission-controller-patch.yaml.j2
diff --git a/templates/config/kubernetes/bootstrap/talos/patches/controller/cluster.yaml.j2 b/templates/config/kubernetes/bootstrap/talos/patches/controller/cluster.yaml.j2
@@ -5,21 +5,13 @@ cluster:
       bind-address: 0.0.0.0
   coreDNS:
     disabled: true
+  etcd:
+    extraArgs:
+      listen-metrics-urls: http://0.0.0.0:2381
+    advertisedSubnets:
+      - #{ node_network }#
   proxy:
     disabled: true
   scheduler:
     extraArgs:
       bind-address: 0.0.0.0
-    config:
-      apiVersion: kubescheduler.config.k8s.io/v1
-      kind: KubeSchedulerConfiguration
-      profiles:
-        - schedulerName: default-scheduler
-          pluginConfig:
-            - name: PodTopologySpread
-              args:
-                defaultingType: List
-                defaultConstraints:
-                  - maxSkew: 1
-                    topologyKey: kubernetes.io/hostname
-                    whenUnsatisfiable: ScheduleAnyway
diff --git a/templates/config/kubernetes/bootstrap/talos/patches/controller/etcd.yaml.j2 b/templates/config/kubernetes/bootstrap/talos/patches/controller/etcd.yaml.j2
diff --git a/templates/config/kubernetes/bootstrap/talos/patches/global/disable-search-domain.yaml.j2 b/templates/config/kubernetes/bootstrap/talos/patches/global/disable-search-domain.yaml.j2
diff --git a/templates/config/kubernetes/bootstrap/talos/patches/global/hostdns.yaml.j2 b/templates/config/kubernetes/bootstrap/talos/patches/global/hostdns.yaml.j2
diff --git a/templates/config/kubernetes/bootstrap/talos/patches/global/kubelet.yaml.j2 b/templates/config/kubernetes/bootstrap/talos/patches/global/kubelet.yaml.j2
diff --git a/...p/talos/patches/global/containerd.yaml.j2 → ...alos/patches/global/machine-files.yaml.j2 b/...p/talos/patches/global/containerd.yaml.j2 → ...alos/patches/global/machine-files.yaml.j2
diff --git a/...alos/patches/global/openebs-local.yaml.j2 → ...os/patches/global/machine-kubelet.yaml.j2 b/...alos/patches/global/openebs-local.yaml.j2 → ...os/patches/global/machine-kubelet.yaml.j2
@@ -8,3 +8,6 @@ machine:
           - bind
           - rshared
           - rw
+    nodeIP:
+      validSubnets:
+        - #{ node_network }#
diff --git a/...ootstrap/talos/patches/global/dns.yaml.j2 → ...os/patches/global/machine-network.yaml.j2 b/...ootstrap/talos/patches/global/dns.yaml.j2 → ...os/patches/global/machine-network.yaml.j2
@@ -1,5 +1,6 @@
 machine:
   network:
+    disableSearchDomain: true
     nameservers:
       #% for item in dns_servers | default(["1.1.1.1","1.0.0.1"], true) %#
       - #{ item }#

diff --git a/...strap/talos/patches/global/sysctl.yaml.j2 → ...os/patches/global/machine-sysctls.yaml.j2 b/...strap/talos/patches/global/sysctl.yaml.j2 → ...os/patches/global/machine-sysctls.yaml.j2
@@ -4,4 +4,3 @@ machine:
     fs.inotify.max_user_instances: "8192"
     net.core.rmem_max: "7500000"
     net.core.wmem_max: "7500000"
-    vm.nr_hugepages: "1024"
diff --git a/...ootstrap/talos/patches/global/ntp.yaml.j2 → ...talos/patches/global/machine-time.yaml.j2 b/...ootstrap/talos/patches/global/ntp.yaml.j2 → ...talos/patches/global/machine-time.yaml.j2
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,6 @@ machine: @@
               - bind
               - rshared
               - rw
+        nodeIP:
+          validSubnets:
+            - #{ node_network }#