diff --git a/control-plane/roles/isolated-clusters/defaults/main/images.yaml b/control-plane/roles/isolated-clusters/defaults/main/images.yaml index 9753820aa..5c77e2898 100644 --- a/control-plane/roles/isolated-clusters/defaults/main/images.yaml +++ b/control-plane/roles/isolated-clusters/defaults/main/images.yaml @@ -113,6 +113,10 @@ isolated_clusters_registry_oci_mirror_config: destination: http://registry:5000/sig-storage/snapshot-controller match: semver: ">= v6.3.0" + - source: registry.k8s.io/coredns/coredns + destination: http://registry:5000/coredns/coredns + match: + semver: ">= v1.10.0" - source: r.metal-stack.io/csi-lvm-controller destination: http://registry:5000/csi-lvm-controller match: diff --git a/control-plane/roles/isolated-clusters/templates/dns/coredns-service.yaml b/control-plane/roles/isolated-clusters/templates/dns/coredns-service.yaml index 7cd1afcb0..a9c15430c 100644 --- a/control-plane/roles/isolated-clusters/templates/dns/coredns-service.yaml +++ b/control-plane/roles/isolated-clusters/templates/dns/coredns-service.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: @@ -7,7 +8,7 @@ metadata: app.kubernetes.io/part-of: isolated-clusters app.kubernetes.io/managed-by: ansible app.kubernetes.io/part-of: "{{ isolated_clusters_group_label }}" - name: coredns + name: coredns-udp spec: type: ClusterIP ports: @@ -15,8 +16,25 @@ spec: port: 53 protocol: UDP targetPort: 8053 + selector: + app.kubernetes.io/name: coredns +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app.kubernetes.io/name: coredns + app.kubernetes.io/component: dns + app.kubernetes.io/part-of: isolated-clusters + app.kubernetes.io/managed-by: ansible + app.kubernetes.io/part-of: "{{ isolated_clusters_group_label }}" + name: coredns-tcp +spec: + type: ClusterIP + ports: - name: dns-tcp port: 53 + protocol: TCP targetPort: 8053 selector: app.kubernetes.io/name: coredns diff --git a/control-plane/roles/isolated-clusters/templates/ingress/values.yaml b/control-plane/roles/isolated-clusters/templates/ingress/values.yaml index af331f8f6..6e13f8c7b 100644 --- a/control-plane/roles/isolated-clusters/templates/ingress/values.yaml +++ b/control-plane/roles/isolated-clusters/templates/ingress/values.yaml @@ -19,7 +19,7 @@ controller: enabled: true tcp: - 53: "{{ isolated_clusters_dns_namespace }}/coredns:53" + 53: "{{ isolated_clusters_dns_namespace }}/coredns-tcp:53" udp: - 53: "{{ isolated_clusters_dns_namespace }}/coredns:53" + 53: "{{ isolated_clusters_dns_namespace }}/coredns-udp:53" 123: "{{ isolated_clusters_ntp_namespace }}/chrony:123" diff --git a/control-plane/roles/isolated-clusters/templates/registry/registry-oci-mirror.yaml b/control-plane/roles/isolated-clusters/templates/registry/registry-oci-mirror.yaml index 5c67a901a..dbde5d0ff 100644 --- a/control-plane/roles/isolated-clusters/templates/registry/registry-oci-mirror.yaml +++ b/control-plane/roles/isolated-clusters/templates/registry/registry-oci-mirror.yaml @@ -54,6 +54,6 @@ metadata: app.kubernetes.io/part-of: isolated-clusters app.kubernetes.io/managed-by: ansible app.kubernetes.io/part-of: "{{ isolated_clusters_group_label }}" -stringData: +data: oci-mirror.yaml: | {{ isolated_clusters_registry_oci_mirror_config | to_nice_yaml | indent(width=6, first=false) }} diff --git a/control-plane/roles/isolated-clusters/templates/registry/registry-service.yaml b/control-plane/roles/isolated-clusters/templates/registry/registry-service.yaml index 8c4d07d43..0ccddaa96 100644 --- a/control-plane/roles/isolated-clusters/templates/registry/registry-service.yaml +++ b/control-plane/roles/isolated-clusters/templates/registry/registry-service.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: