From dc606c984e7e8e383216089b35ac08198c398062 Mon Sep 17 00:00:00 2001
From: Jory Irving <46251616+LilDrunkenSmurf@users.noreply.github.com>
Date: Wed, 31 May 2023 09:55:34 -0600
Subject: [PATCH] fix: change Cilium IPAM mode to kubernetes (#762)

Co-authored-by: Devin Buhl <onedr0p@users.noreply.github.com>
---
 .../templates/custom-cilium-helmchart.yaml.j2 | 27 ++-----------------
 .../kube-system/cilium/app/helmrelease.yaml   |  6 +----
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 b/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2
index 264645e0..695735c6 100644
--- a/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2
+++ b/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2
@@ -21,35 +21,12 @@ spec:
       integration: containerd
       socketPath: /var/run/k3s/containerd/containerd.sock
     hubble:
-      enabled: true
-      metrics:
-        enabled:
-          - dns:query;ignoreAAAA
-          - drop
-          - tcp
-          - flow
-          - port-distribution
-          - icmp
-          - http
-      relay:
-        enabled: true
-        rollOutPods: true
-      ui:
-        enabled: true
-        rollOutPods: true
-        ingress:
-          enabled: false
+      enabled: false
     ipam:
-      mode: cluster-pool
-      operator:
-        clusterPoolIPv4PodCIDRList: ["{{ cluster_cidr }}"]
-        clusterPoolIPv4MaskSize: 24
+      mode: kubernetes
     k8sServiceHost: "{{ kubevip_address }}"
     k8sServicePort: 6443
     kubeProxyReplacement: strict
     kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
     operator:
-      enabled: true
       replicas: 1
-      rollOutPods: true
-    rollOutCiliumPods: true
diff --git a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml
index a04a5571..f8703416 100644
--- a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml
@@ -65,16 +65,12 @@ spec:
             - hosts:
                 - *host
     ipam:
-      mode: cluster-pool
-      operator:
-        clusterPoolIPv4PodCIDRList: ["${CLUSTER_CIDR}"]
-        clusterPoolIPv4MaskSize: 24
+      mode: kubernetes
     k8sServiceHost: "${KUBE_VIP_ADDR}"
     k8sServicePort: 6443
     kubeProxyReplacement: strict
     kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
     operator:
-      enabled: true
       replicas: 1
       rollOutPods: true
       prometheus: