From 7da9ed37461a76a903139aafd19bc9a5f5feaad7 Mon Sep 17 00:00:00 2001 From: Omer Date: Mon, 25 Nov 2024 14:39:56 +0000 Subject: [PATCH] [Designate] Add Mdns replica count DesignateMdns deployment type is being changed to stateful set. This commit adds replica count to Mdns in all the Designate CRs. Depends-On: https://github.com/openstack-k8s-operators/designate-operator/pull/255 Jira: https://issues.redhat.com/browse/OSPRH-11923 --- .../core_v1beta1_openstackcontrolplane.yaml | 2 +- config/samples/core_v1beta1_openstackcontrolplane_galera.yaml | 2 +- .../core_v1beta1_openstackcontrolplane_galera_3replicas.yaml | 2 +- ..._v1beta1_openstackcontrolplane_galera_network_isolation.yaml | 2 +- ...penstackcontrolplane_galera_network_isolation_3replicas.yaml | 2 +- .../core_v1beta1_openstackcontrolplane_network_isolation.yaml | 2 +- ...re_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml | 2 +- ...stackcontrolplane_network_isolation_tls_public_endpoint.yaml | 2 +- tests/kuttl/common/assert-sample-deployment.yaml | 2 ++ .../ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml | 2 ++ .../tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml | 2 ++ .../ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml | 2 ++ .../ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml | 2 ++ .../ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml | 2 ++ 14 files changed, 20 insertions(+), 8 deletions(-) diff --git a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml index 77de0b644..cc05eec5f 100644 --- a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml @@ -205,7 +205,7 @@ spec: designateProducer: replicas: 1 # backend needs to be configured designateMdns: - replicas: 0 # backend needs to be configured + replicas: 1 # backend needs to be configured designateBackendbind9: replicas: 1 # backend needs to be configured storageClass: local-storage diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index d76bbbd8c..46af8b548 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -232,7 +232,7 @@ spec: designateProducer: replicas: 1 designateMdns: - replicas: 0 + replicas: 1 networkAttachments: - designate designateBackendbind9: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml index 166330b56..9416617b4 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml @@ -217,7 +217,7 @@ spec: designateProducer: replicas: 1 designateMdns: - replicas: 0 + replicas: 1 networkAttachments: - designate designateBackendbind9: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index ee81d14a9..05c5a6dac 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -419,7 +419,7 @@ spec: designateProducer: replicas: 1 designateMdns: - replicas: 0 + replicas: 1 networkAttachments: - designate designateBackendbind9: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml index 61a66f117..e05039f67 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -421,7 +421,7 @@ spec: designateProducer: replicas: 1 designateMdns: - replicas: 0 + replicas: 1 networkAttachments: - designate designateBackendbind9: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index f08241b4d..f8a5d4236 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -415,7 +415,7 @@ spec: designateProducer: replicas: 1 designateMdns: - replicas: 0 + replicas: 1 networkAttachments: - designate designateBackendbind9: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 8ef922460..ca138c63d 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -440,7 +440,7 @@ spec: designateProducer: replicas: 1 designateMdns: - replicas: 0 + replicas: 1 networkAttachments: - designate designateBackendbind9: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml index 08c059a1e..5e7768f4b 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml @@ -418,7 +418,7 @@ spec: designateProducer: replicas: 1 designateMdns: - replicas: 0 + replicas: 1 networkAttachments: - designate designateBackendbind9: diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml index 425580a69..06d5d9bdf 100644 --- a/tests/kuttl/common/assert-sample-deployment.yaml +++ b/tests/kuttl/common/assert-sample-deployment.yaml @@ -153,6 +153,8 @@ spec: replicas: 1 designateCentral: replicas: 1 + designateMdns: + replicas: 1 designateWorker: replicas: 1 designateProducer: diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml index dee2a3440..36edc7de5 100644 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml +++ b/tests/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml @@ -153,6 +153,8 @@ spec: replicas: 1 designateCentral: replicas: 1 + designateMdns: + replicas: 1 designateWorker: replicas: 1 designateProducer: diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml index 4d6a917a0..83a0bc2f7 100644 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml +++ b/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml @@ -174,6 +174,8 @@ spec: replicas: 1 designateCentral: replicas: 1 + designateMdns: + replicas: 1 designateWorker: replicas: 1 designateProducer: diff --git a/tests/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml index 117948ca0..65acc8ea5 100644 --- a/tests/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml +++ b/tests/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml @@ -153,6 +153,8 @@ spec: replicas: 1 designateCentral: replicas: 1 + designateMdns: + replicas: 1 designateWorker: replicas: 1 designateProducer: diff --git a/tests/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml index 117948ca0..65acc8ea5 100644 --- a/tests/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml +++ b/tests/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml @@ -153,6 +153,8 @@ spec: replicas: 1 designateCentral: replicas: 1 + designateMdns: + replicas: 1 designateWorker: replicas: 1 designateProducer: diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml index b3286e144..66cae578e 100644 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml +++ b/tests/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml @@ -164,6 +164,8 @@ spec: replicas: 1 designateCentral: replicas: 1 + designateMdns: + replicas: 1 designateWorker: replicas: 1 designateProducer: