feat(talos): change from net.ifnames to a macaddr deviceSelector (#1376)

* feat(talos): change from net.ifnames to a macaddr deviceSelector

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: derpge

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: logic is easier to follow now questionmark

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: logic is easier to follow now questionmark

Signed-off-by: Devin Buhl <devin@buhl.casa>

---------

Signed-off-by: Devin Buhl <devin@buhl.casa>

bootstrap/templates/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2

@@ -2,10 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  #% if bootstrap_bgp.enabled %#
-  - ./cilium-bgp.yaml
-  #% endif %#
-  #% if ((not bootstrap_bgp.enabled) and (not bootstrap_feature_gates.dual_stack_ipv4_first)) %#
-  - ./cilium-l2.yaml
-  #% endif %#
   - ./helmrelease.yaml

bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l2.yaml.j2

@@ -1,14 +1,16 @@
+#% if ((not bootstrap_bgp.enabled) and (not bootstrap_feature_gates.dual_stack_ipv4_first)) %#
 ---
 # https://docs.cilium.io/en/latest/network/l2-announcements
 apiVersion: cilium.io/v2alpha1
 kind: CiliumL2AnnouncementPolicy
 metadata:
-  name: policy
+  name: l2-policy
 spec:
   loadBalancerIPs: true
-  # NOTE: This might need to be set if you have more than one active NIC on your hosts
+  # NOTE: interfaces might need to be set if you have more than one active NIC on your hosts
   # interfaces:
   #   - ^eno[0-9]+
+  #   - ^eth[0-9]+
   nodeSelector:
     matchLabels:
       kubernetes.io/os: linux
@@ -16,7 +18,9 @@ spec:
 apiVersion: cilium.io/v2alpha1
 kind: CiliumLoadBalancerIPPool
 metadata:
-  name: pool
+  name: l2-pool
 spec:
-  cidrs:
+  allowFirstLastIPs: "Yes"
+  blocks:
     - cidr: "${NODE_CIDR}"
+#% endif %#

bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l3.yaml.j2

@@ -1,9 +1,10 @@
+#% if bootstrap_bgp.enabled %#
 ---
 # https://docs.cilium.io/en/latest/network/bgp-control-plane/
 apiVersion: cilium.io/v2alpha1
 kind: CiliumBGPPeeringPolicy
 metadata:
-  name: policy
+  name: l3-policy
 spec:
   nodeSelector:
     matchLabels:
@@ -31,7 +32,9 @@ spec:
 apiVersion: cilium.io/v2alpha1
 kind: CiliumLoadBalancerIPPool
 metadata:
-  name: pool
+  name: l3-pool
 spec:
-  cidrs:
+  allowFirstLastIPs: "Yes"
+  blocks:
     - cidr: "${BGP_ADVERTISED_CIDR}"
+#% endif %#

bootstrap/templates/kubernetes/apps/kube-system/cilium/config/kustomization.yaml.j2

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  #% if bootstrap_bgp.enabled %#
+  - ./cilium-l3.yaml
+  #% elif not bootstrap_feature_gates.dual_stack_ipv4_first %#
+  - ./cilium-l2.yaml
+  #% else %#
+  []
+  #% endif %#

bootstrap/templates/kubernetes/apps/kube-system/cilium/ks.yaml.j2

@@ -11,6 +11,28 @@ spec:
       app.kubernetes.io/name: *app
   path: ./kubernetes/apps/kube-system/cilium/app
   prune: false # never should be deleted
+  sourceRef:
+    kind: GitRepository
+    name: home-kubernetes
+  wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app cilium-config
+  namespace: flux-system
+spec:
+  targetNamespace: kube-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  dependsOn:
+    - name: cilium
+  path: ./kubernetes/apps/kube-system/cilium/config
+  prune: false # never should be deleted
   sourceRef:
     kind: GitRepository
     name: home-kubernetes