talos/patches/cilium.sh

@@ -1,7 +1,20 @@
 #!/usr/bin/env bash
 
+cat > template.yaml << 'EOF'
+cluster:
+  network:
+    cni:
+      name: none
+  proxy:
+    disabled: true
+  inlineManifests:
+    - name: cilium
+      contents: |
+        __CILIUM_MANIFEST__
+EOF
+
 helm repo add cilium https://helm.cilium.io/
-helm install \
+helm template \
     cilium \
     cilium/cilium \
     --version 1.18.3 \
@@ -16,4 +29,9 @@ helm install \
     --set cgroup.autoMount.enabled=false \
     --set cgroup.hostRoot=/sys/fs/cgroup \
     --set k8sServiceHost=localhost \
-    --set k8sServicePort=7445
+    --set k8sServicePort=7445 | sed 's/^/        /' > manifest.tmp
+
+sed -e '/__CILIUM_MANIFEST__/r manifest.tmp' -e '/__CILIUM_MANIFEST__/d' template.yaml > cilium.yaml
+
+rm manifest.tmp
+rm template.yaml

talos/patches/docker-proxy.yaml

@@ -9,15 +9,12 @@ machine:
       ghcr.io:
         endpoints:
           - http://harbor.noxxos.nl/v2/proxy-ghcr.io
-          - https://ghcr.io
         overridePath: true
       gcr.io:
         endpoints:
           - http://harbor.noxxos.nl/v2/proxy-gcr.io
-          - https://gcr.io
         overridePath: true
       registry.k8s.io:
         endpoints:
           - http://harbor.noxxos.nl/v2/proxy-registry.k8s.io
-          - https://registry.k8s.io
         overridePath: true

talos/patches/network.yaml

@@ -1,6 +0,0 @@
-cluster:
-  network:
-    cni:
-      name: none
-  proxy:
-    disabled: true