diff --git a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 index a5928be4323..d04ce62aa1b 100644 --- a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 +++ b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 @@ -9,7 +9,7 @@ spec: repo: https://helm.cilium.io/ chart: cilium # renovate: datasource=helm depName=cilium repository=https://helm.cilium.io - version: 1.14.6 + version: 1.15.0 targetNamespace: kube-system bootstrap: true valuesContent: |- diff --git a/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 b/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 index 2324094a7a1..97d94a8cf50 100644 --- a/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 +++ b/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 @@ -85,7 +85,7 @@ spec: - name: cilium chartname: cilium/cilium # renovate: datasource=helm depName=cilium repository=https://helm.cilium.io - version: 1.14.6 + version: 1.15.0 namespace: kube-system values: |2 {% filter indent(width=18, first=True) %} diff --git a/bootstrap/templates/kubernetes/talos/cilium/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/talos/cilium/kustomization.yaml.j2 index a84e2566466..26b2c0154f1 100644 --- a/bootstrap/templates/kubernetes/talos/cilium/kustomization.yaml.j2 +++ b/bootstrap/templates/kubernetes/talos/cilium/kustomization.yaml.j2 @@ -4,7 +4,7 @@ kind: Kustomization helmCharts: - name: cilium repo: https://helm.cilium.io - version: 1.14.6 + version: 1.15.0 releaseName: cilium namespace: kube-system valuesFile: values.yaml diff --git a/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 b/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 index af57c5c3d97..aca34815f97 100644 --- a/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 +++ b/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 @@ -80,10 +80,6 @@ l2announcements: enabled: false {% else %} enabled: true - # https://github.com/cilium/cilium/issues/26586 - leaseDuration: 120s - leaseRenewDeadline: 60s - leaseRetryPeriod: 1s {% endif %} loadBalancer: algorithm: maglev @@ -92,6 +88,23 @@ localRedirectPolicy: true operator: replicas: 1 rollOutPods: true + prometheus: + enabled: true + serviceMonitor: + enabled: true + dashboards: + enabled: true + annotations: + grafana_folder: Cilium +prometheus: + enabled: true + serviceMonitor: + enabled: true + trustCRDsExist: true +dashboards: + enabled: true + annotations: + grafana_folder: Cilium rollOutCiliumPods: true routingMode: native securityContext: diff --git a/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 b/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 index 42d7b1dd7a3..581ca66ff09 100644 --- a/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 +++ b/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 @@ -43,10 +43,6 @@ l2announcements: enabled: false {% else %} enabled: true - # https://github.com/cilium/cilium/issues/26586 - leaseDuration: 120s - leaseRenewDeadline: 60s - leaseRetryPeriod: 1s {% endif %} loadBalancer: algorithm: maglev