From 413e47f6f0d9f27468b64e7048f162a838fa4174 Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 31 Oct 2024 14:28:55 -0700 Subject: [PATCH] test: set default dns fields in all examples --- examples/capi-quick-start/aws-cluster-calico-crs.yaml | 2 ++ .../capi-quick-start/aws-cluster-calico-helm-addon.yaml | 2 ++ examples/capi-quick-start/aws-cluster-cilium-crs.yaml | 2 ++ .../capi-quick-start/aws-cluster-cilium-helm-addon.yaml | 2 ++ examples/capi-quick-start/docker-cluster-calico-crs.yaml | 2 ++ .../capi-quick-start/docker-cluster-calico-helm-addon.yaml | 2 ++ examples/capi-quick-start/docker-cluster-cilium-crs.yaml | 2 ++ .../capi-quick-start/docker-cluster-cilium-helm-addon.yaml | 2 ++ examples/capi-quick-start/nutanix-cluster-calico-crs.yaml | 2 ++ .../nutanix-cluster-calico-helm-addon.yaml | 2 ++ examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml | 2 ++ .../nutanix-cluster-cilium-helm-addon.yaml | 2 ++ hack/examples/bases/aws/cluster/kustomization.yaml.tmpl | 3 +++ hack/examples/bases/docker/cluster/kustomization.yaml.tmpl | 3 +++ .../examples/bases/nutanix/cluster/kustomization.yaml.tmpl | 3 +++ hack/examples/patches/coredns.yaml | 7 +++++++ 16 files changed, 40 insertions(+) create mode 100644 hack/examples/patches/coredns.yaml diff --git a/examples/capi-quick-start/aws-cluster-calico-crs.yaml b/examples/capi-quick-start/aws-cluster-calico-crs.yaml index e12e5eadf..4c2ce5b6b 100644 --- a/examples/capi-quick-start/aws-cluster-calico-crs.yaml +++ b/examples/capi-quick-start/aws-cluster-calico-crs.yaml @@ -50,6 +50,8 @@ spec: baseOS: ${AMI_LOOKUP_BASEOS} format: ${AMI_LOOKUP_FORMAT} org: "${AMI_LOOKUP_ORG}" + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/aws-cluster-calico-helm-addon.yaml b/examples/capi-quick-start/aws-cluster-calico-helm-addon.yaml index f0bb339c6..d99a8eb53 100644 --- a/examples/capi-quick-start/aws-cluster-calico-helm-addon.yaml +++ b/examples/capi-quick-start/aws-cluster-calico-helm-addon.yaml @@ -44,6 +44,8 @@ spec: baseOS: ${AMI_LOOKUP_BASEOS} format: ${AMI_LOOKUP_FORMAT} org: "${AMI_LOOKUP_ORG}" + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/aws-cluster-cilium-crs.yaml b/examples/capi-quick-start/aws-cluster-cilium-crs.yaml index b568db44b..ebe3ce7fe 100644 --- a/examples/capi-quick-start/aws-cluster-cilium-crs.yaml +++ b/examples/capi-quick-start/aws-cluster-cilium-crs.yaml @@ -50,6 +50,8 @@ spec: baseOS: ${AMI_LOOKUP_BASEOS} format: ${AMI_LOOKUP_FORMAT} org: "${AMI_LOOKUP_ORG}" + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/aws-cluster-cilium-helm-addon.yaml b/examples/capi-quick-start/aws-cluster-cilium-helm-addon.yaml index 45199b072..78342766e 100644 --- a/examples/capi-quick-start/aws-cluster-cilium-helm-addon.yaml +++ b/examples/capi-quick-start/aws-cluster-cilium-helm-addon.yaml @@ -44,6 +44,8 @@ spec: baseOS: ${AMI_LOOKUP_BASEOS} format: ${AMI_LOOKUP_FORMAT} org: "${AMI_LOOKUP_ORG}" + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/docker-cluster-calico-crs.yaml b/examples/capi-quick-start/docker-cluster-calico-crs.yaml index b5b65ead7..aeaf9aa93 100644 --- a/examples/capi-quick-start/docker-cluster-calico-crs.yaml +++ b/examples/capi-quick-start/docker-cluster-calico-crs.yaml @@ -48,6 +48,8 @@ spec: - end: 198.18.1.30 start: 198.18.1.21 provider: MetalLB + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/docker-cluster-calico-helm-addon.yaml b/examples/capi-quick-start/docker-cluster-calico-helm-addon.yaml index 82ae74c52..984a3d64b 100644 --- a/examples/capi-quick-start/docker-cluster-calico-helm-addon.yaml +++ b/examples/capi-quick-start/docker-cluster-calico-helm-addon.yaml @@ -43,6 +43,8 @@ spec: - end: 198.18.1.30 start: 198.18.1.21 provider: MetalLB + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/docker-cluster-cilium-crs.yaml b/examples/capi-quick-start/docker-cluster-cilium-crs.yaml index 44379f818..cd503b75f 100644 --- a/examples/capi-quick-start/docker-cluster-cilium-crs.yaml +++ b/examples/capi-quick-start/docker-cluster-cilium-crs.yaml @@ -48,6 +48,8 @@ spec: - end: 198.18.1.30 start: 198.18.1.21 provider: MetalLB + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml b/examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml index c1c737094..94da0f6d9 100644 --- a/examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml +++ b/examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml @@ -43,6 +43,8 @@ spec: - end: 198.18.1.30 start: 198.18.1.21 provider: MetalLB + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml index 2f16b5829..ceb489010 100644 --- a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml +++ b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml @@ -116,6 +116,8 @@ spec: systemDiskSize: 40Gi vcpuSockets: 2 vcpusPerSocket: 1 + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml index 256fac083..747f64620 100644 --- a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml +++ b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml @@ -113,6 +113,8 @@ spec: systemDiskSize: 40Gi vcpuSockets: 2 vcpusPerSocket: 1 + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml index 669a641bf..be7f45db8 100644 --- a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml +++ b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml @@ -116,6 +116,8 @@ spec: systemDiskSize: 40Gi vcpuSockets: 2 vcpusPerSocket: 1 + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml index ba97f775f..c7b986816 100644 --- a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml +++ b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml @@ -113,6 +113,8 @@ spec: systemDiskSize: 40Gi vcpuSockets: 2 vcpusPerSocket: 1 + dns: + coreDNS: {} encryptionAtRest: providers: - aescbc: {} diff --git a/hack/examples/bases/aws/cluster/kustomization.yaml.tmpl b/hack/examples/bases/aws/cluster/kustomization.yaml.tmpl index 0e3f8436c..e8364acfa 100644 --- a/hack/examples/bases/aws/cluster/kustomization.yaml.tmpl +++ b/hack/examples/bases/aws/cluster/kustomization.yaml.tmpl @@ -48,6 +48,9 @@ patches: - target: kind: Cluster path: ../../../patches/encryption.yaml +- target: + kind: Cluster + path: ../../../patches/coredns.yaml # Delete the clusterclass-specific resources. - target: diff --git a/hack/examples/bases/docker/cluster/kustomization.yaml.tmpl b/hack/examples/bases/docker/cluster/kustomization.yaml.tmpl index a37039a7a..824072a6a 100644 --- a/hack/examples/bases/docker/cluster/kustomization.yaml.tmpl +++ b/hack/examples/bases/docker/cluster/kustomization.yaml.tmpl @@ -41,6 +41,9 @@ patches: - target: kind: Cluster path: ../../../patches/encryption.yaml +- target: + kind: Cluster + path: ../../../patches/coredns.yaml # Deploy ServiceLoadBalancer MetalLB - target: diff --git a/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl b/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl index 8c80d9ed1..c6a36bb1e 100644 --- a/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl +++ b/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl @@ -39,6 +39,9 @@ patches: - target: kind: Cluster path: ../../../patches/encryption.yaml +- target: + kind: Cluster + path: ../../../patches/coredns.yaml # Remove Additional Trust Bundle ConfigMap - target: diff --git a/hack/examples/patches/coredns.yaml b/hack/examples/patches/coredns.yaml new file mode 100644 index 000000000..2a373c831 --- /dev/null +++ b/hack/examples/patches/coredns.yaml @@ -0,0 +1,7 @@ +# Copyright 2024 Nutanix. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +- op: "add" + path: "/spec/topology/variables/0/value/dns" + value: + coreDNS: {}