feat: update kube-vip ansible playbook for k0s and k3s - ipv6 config changes (#1234)

* feat: update kube-vip ansible playbook for k0s and k3s Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: update renovate Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: move ipv6 to advanced options Signed-off-by: Devin Buhl <devin@buhl.casa> * feat: kube-vip manifests to partials Signed-off-by: Devin Buhl <devin@buhl.casa> * feat: kube vip samesies Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: update config sample Signed-off-by: Devin Buhl <devin@buhl.casa> --------- Signed-off-by: Devin Buhl <devin@buhl.casa>
2024-01-22 15:28:21 -05:00
1 parent 6557c255d6
commit afbf097dac
@@ -8,7 +8,7 @@ spec:
  chart:
    spec:
      chart: cilium
-      version: 1.14.6
+      version: 1.14.5
      sourceRef:
        kind: HelmRepository
        name: cilium
@@ -2,7 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  #% if not bootstrap_ipv6_enabled %#
+  #% if not bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
  - ./cilium-l2.yaml
  #% endif %#
  - ./helmrelease.yaml
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "talos" %#
+#% if bootstrap_distribution in ['talos'] %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "talos" %#
+#% if bootstrap_distribution in ['talos'] %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "talos" %#
+#% if bootstrap_distribution in ['talos'] %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -4,7 +4,7 @@ kind: Kustomization
 resources:
  - ./namespace.yaml
  - ./cilium/ks.yaml
-  #% if bootstrap_distribution == "talos" %#
+  #% if bootstrap_distribution in ['talos'] %#
  - ./kubelet-csr-approver/ks.yaml
  #% endif %#
  - ./metrics-server/ks.yaml
@@ -25,7 +25,7 @@ spec:
    keepHistory: false
  values:
    spegel:
-      #% if bootstrap_distribution == "k0s" %#
+      #% if bootstrap_distribution in ['k0s'] %#
      containerdSock: /run/k0s/containerd.sock
      containerdRegistryConfigPath: /var/lib/k0s/containerd/certs.d
      #% endif %#
@@ -53,7 +53,7 @@ spec:
      enabled: true
      serviceMonitor:
        metricRelabelings:
-          #% if bootstrap_distribution == 'k3s' %#
+          #% if bootstrap_distribution in ['k3s'] %#
          # Remove duplicate labels provided by k3s
          - action: keep
            sourceLabels: ["__name__"]
@@ -74,7 +74,7 @@ spec:
      enabled: true
      serviceMonitor:
        metricRelabelings:
-          #% if bootstrap_distribution == 'k3s' %#
+          #% if bootstrap_distribution in ['k3s'] %#
          # Remove duplicate labels provided by k3s
          - action: keep
            sourceLabels: ["__name__"]
@@ -93,7 +93,7 @@ spec:
      #% for item in bootstrap_nodes.master %#
        - "#{ item.address }#"
      #% endfor %#
-      #% if bootstrap_distribution == 'k3s' %#
+      #% if bootstrap_distribution in ['k3s'] %#
      serviceMonitor:
        metricRelabelings:
          # Remove duplicate labels provided by k3s
@@ -107,7 +107,7 @@ spec:
    kubeScheduler:
      enabled: true
      endpoints: *endpoints
-      #% if bootstrap_distribution == 'k3s' %#
+      #% if bootstrap_distribution in ['k3s'] %#
      serviceMonitor:
        metricRelabelings:
          # Remove duplicate labels provided by k3s
@@ -26,7 +26,7 @@ spec:
  values:
    externalSnapshotter:
      enabled: false
-    #% if bootstrap_distribution == "k0s" %#
+    #% if bootstrap_distribution in ['k0s'] %#
    kubeletDir: /var/lib/k0s/kubelet
    #% endif %#
 #% endif %#
@@ -25,7 +25,7 @@ spec:
    keepHistory: false
  values:
    linux:
-      #% if bootstrap_distribution == "k0s" %#
+      #% if bootstrap_distribution in ['k0s'] %#
      kubelet: /var/lib/k0s/kubelet
      #% else %#
      kubelet: /var/lib/kubelet
@@ -5,6 +5,6 @@ resources:
  - ./namespace.yaml
  - ./descheduler/ks.yaml
  - ./reloader/ks.yaml
-  #% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+  #% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
  - ./system-upgrade-controller/ks.yaml
  #% endif %#
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+#% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+#% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+#% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+#% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+#% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+#% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
+#% if bootstrap_distribution in ['k3s'] and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: upgrade.cattle.io/v1
 kind: Plan