fix: keep included k3s coredns (#1197)

* Delete bootstrap/templates/kubernetes/apps/kube-system/coredns directory * Update kustomization.yaml.j2 * Delete bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2 * Update cluster-installation.yaml.j2 * Delete bootstrap/templates/ansible/playbooks/tasks/coredns.yaml.j2 * Update main.yaml.j2 * Update main.yaml.j2 * Update main.yaml.j2 * Update main.yaml.j2 * Update cluster-installation.yaml.j2
2024-01-19 06:13:39 -05:00
1 parent 91d8b84f3c
commit eed4faa9e6
@@ -46,12 +46,7 @@
        wait_sleep: 10
        wait_timeout: 360
      loop:
-        - { name: cilium,  kind: HelmChart, namespace: kube-system } # noqa: yaml[commas]
-        - { name: coredns, kind: HelmChart, namespace: kube-system }
-
-    - name: Coredns
-      when: k3s_primary_control_node
-      ansible.builtin.include_tasks: tasks/coredns.yaml
+        - { name: cilium, kind: HelmChart, namespace: kube-system }

    - name: Cilium
      when: k3s_primary_control_node
@@ -1,58 +0,0 @@
-#% if bootstrap_distribution == 'k3s' %#
---
- name: Coredns
-  block:
-    - name: Coredns | Check if Coredns HelmChart exists
-      kubernetes.core.k8s_info:
-        kubeconfig: /etc/rancher/k3s/k3s.yaml
-        name: coredns
-        kind: HelmChart
-        namespace: kube-system
-      register: coredns_helmchart
-
-    - name: Coredns | Wait for Coredns to rollout
-      when: coredns_helmchart.resources | count > 0
-      kubernetes.core.k8s_info:
-        kubeconfig: /etc/rancher/k3s/k3s.yaml
-        name: helm-install-coredns
-        kind: Job
-        namespace: kube-system
-        wait: true
-        wait_condition:
-          type: Complete
-          status: true
-        wait_timeout: 360
-
-    - name: Coredns | Patch the Coredns HelmChart to unmanage it
-      when: coredns_helmchart.resources | count > 0
-      kubernetes.core.k8s_json_patch:
-        kubeconfig: /etc/rancher/k3s/k3s.yaml
-        name: coredns
-        kind: HelmChart
-        namespace: kube-system
-        patch:
-          - op: add
-            path: /metadata/annotations/helmcharts.helm.cattle.io~1unmanaged
-            value: "true"
-
-    - name: Coredns | Delete the Coredns HelmChart CR
-      when: coredns_helmchart.resources | count > 0
-      kubernetes.core.k8s:
-        kubeconfig: /etc/rancher/k3s/k3s.yaml
-        name: coredns
-        kind: HelmChart
-        namespace: kube-system
-        state: absent
-
-    - name: Coredns | Force delete the Coredns HelmChart
-      when: coredns_helmchart.resources | count > 0
-      kubernetes.core.k8s:
-        kubeconfig: /etc/rancher/k3s/k3s.yaml
-        name: coredns
-        kind: HelmChart
-        namespace: kube-system
-        state: patched
-        definition:
-          metadata:
-            finalizers: []
-#% endif %#
@@ -1,79 +0,0 @@
-#% if bootstrap_distribution == 'k3s' %#
---
-# https://docs.k3s.io/helm
-apiVersion: helm.cattle.io/v1
-kind: HelmChart
-metadata:
-  name: coredns
-  namespace: kube-system
-spec:
-  # renovate: datasource=helm
-  repo: https://coredns.github.io/helm
-  chart: coredns
-  version: 1.29.0
-  targetNamespace: kube-system
-  bootstrap: true
-  valuesContent: |-
-    fullnameOverride: coredns
-    replicaCount: 1
-    k8sAppLabelOverride: kube-dns
-    service:
-      name: kube-dns
-      clusterIP: "{{ coredns_addr }}"
-    serviceAccount:
-      create: true
-    deployment:
-      annotations:
-        reloader.stakater.com/auto: "true"
-    servers:
-      - zones:
-          - zone: .
-            scheme: dns://
-            use_tcp: true
-        port: 53
-        plugins:
-          - name: log
-          - name: errors
-          - name: health
-            configBlock: |-
-              lameduck 5s
-          - name: ready
-          - name: kubernetes
-            parameters: cluster.local in-addr.arpa ip6.arpa
-            configBlock: |-
-              pods insecure
-              fallthrough in-addr.arpa ip6.arpa
-              ttl 30
-          - name: prometheus
-            parameters: 0.0.0.0:9153
-          - name: forward
-            parameters: . /etc/resolv.conf
-          - name: cache
-            parameters: 30
-          - name: loop
-          - name: reload
-          - name: loadbalance
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-role.kubernetes.io/control-plane
-                  operator: Exists
-    tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
-      - key: node-role.kubernetes.io/control-plane
-        operator: Exists
-        effect: NoSchedule
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-    topologySpreadConstraints:
-      - maxSkew: 1
-        topologyKey: kubernetes.io/hostname
-        whenUnsatisfiable: DoNotSchedule
-        labelSelector:
-          matchLabels:
-            app.kubernetes.io/instance: coredns
-#% endif %#