From d7fbf749fb15a5594c3b444c50a0274b05fa8b70 Mon Sep 17 00:00:00 2001 From: Omer Schwartz Date: Thu, 24 Oct 2024 16:31:19 +0000 Subject: [PATCH] [Designate] Add Bind9 storageRequest and replica count After DesignateBackendBind9 was changed to a stateful set, Designate requires a persistent volume claim. This patch adds the pvc value to the control plane definition, and requires a replica count minimum of at least 1. --- .../core_v1beta1_openstackcontrolplane.yaml | 10 ++++++---- .../core_v1beta1_openstackcontrolplane_galera.yaml | 8 +++++--- ...v1beta1_openstackcontrolplane_galera_3replicas.yaml | 8 +++++--- ...openstackcontrolplane_galera_network_isolation.yaml | 8 +++++--- ...ontrolplane_galera_network_isolation_3replicas.yaml | 8 +++++--- ...1beta1_openstackcontrolplane_network_isolation.yaml | 8 +++++--- ...1_openstackcontrolplane_network_isolation_ceph.yaml | 8 +++++--- ...rolplane_network_isolation_tls_public_endpoint.yaml | 8 +++++--- tests/kuttl/common/assert-sample-deployment.yaml | 8 ++++---- .../00-assert-deploy-openstack.yaml | 8 ++++---- .../03-assert-new-certs.yaml | 8 ++++---- .../01-assert-deploy-openstack.yaml | 8 ++++---- .../09-assert-deploy-openstack.yaml | 8 ++++---- .../03-assert-deploy-openstack.yaml | 8 ++++---- 14 files changed, 65 insertions(+), 49 deletions(-) diff --git a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml index 0cb6c1757..77de0b644 100644 --- a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml @@ -199,12 +199,14 @@ spec: designateAPI: replicas: 1 designateCentral: - replicas: 0 # backend needs to be configured + replicas: 1 # backend needs to be configured designateWorker: - replicas: 0 # backend needs to be configured + replicas: 1 # backend needs to be configured designateProducer: - replicas: 0 # backend needs to be configured + replicas: 1 # backend needs to be configured designateMdns: replicas: 0 # backend needs to be configured designateBackendbind9: - replicas: 0 # backend needs to be configured + replicas: 1 # backend needs to be configured + storageClass: local-storage + storageRequest: 10G diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index eea752894..d76bbbd8c 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -226,16 +226,18 @@ spec: designateCentral: replicas: 1 designateWorker: - replicas: 0 + replicas: 1 networkAttachments: - designate designateProducer: - replicas: 0 + replicas: 1 designateMdns: replicas: 0 networkAttachments: - designate designateBackendbind9: - replicas: 0 + replicas: 1 + storageClass: local-storage + storageRequest: 10G networkAttachments: - designate diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml index 2bf13bff3..166330b56 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml @@ -211,17 +211,19 @@ spec: designateCentral: replicas: 1 designateWorker: - replicas: 0 + replicas: 1 networkAttachments: - designate designateProducer: - replicas: 0 + replicas: 1 designateMdns: replicas: 0 networkAttachments: - designate designateBackendbind9: - replicas: 0 + replicas: 1 + storageClass: local-storage + storageRequest: 10G networkAttachments: - designate swift: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index 80ecfb47b..ee81d14a9 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -413,16 +413,18 @@ spec: designateCentral: replicas: 1 designateWorker: - replicas: 0 + replicas: 1 networkAttachments: - designate designateProducer: - replicas: 0 + replicas: 1 designateMdns: replicas: 0 networkAttachments: - designate designateBackendbind9: - replicas: 0 + replicas: 1 + storageClass: local-storage + storageRequest: 10G networkAttachments: - designate 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 d6f634a9e..61a66f117 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -415,16 +415,18 @@ spec: designateCentral: replicas: 1 designateWorker: - replicas: 0 + replicas: 1 networkAttachments: - designate designateProducer: - replicas: 0 + replicas: 1 designateMdns: replicas: 0 networkAttachments: - designate designateBackendbind9: - replicas: 0 + replicas: 1 + storageClass: local-storage + storageRequest: 10G networkAttachments: - designate diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index 6dfea29c8..f08241b4d 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -409,16 +409,18 @@ spec: designateCentral: replicas: 1 designateWorker: - replicas: 0 + replicas: 1 networkAttachments: - designate designateProducer: - replicas: 0 + replicas: 1 designateMdns: replicas: 0 networkAttachments: - designate designateBackendbind9: - replicas: 0 + replicas: 1 + storageClass: local-storage + storageRequest: 10G networkAttachments: - designate diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 113207d1c..8ef922460 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -434,16 +434,18 @@ spec: designateCentral: replicas: 1 designateWorker: - replicas: 0 + replicas: 1 networkAttachments: - designate designateProducer: - replicas: 0 + replicas: 1 designateMdns: replicas: 0 networkAttachments: - designate designateBackendbind9: - replicas: 0 + replicas: 1 + storageClass: local-storage + storageRequest: 10G networkAttachments: - designate 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 1ef36f20d..08c059a1e 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 @@ -412,16 +412,18 @@ spec: designateCentral: replicas: 1 designateWorker: - replicas: 0 + replicas: 1 networkAttachments: - designate designateProducer: - replicas: 0 + replicas: 1 designateMdns: replicas: 0 networkAttachments: - designate designateBackendbind9: - replicas: 0 + replicas: 1 + storageClass: local-storage + storageRequest: 10G networkAttachments: - designate diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml index 73a5bd6a9..425580a69 100644 --- a/tests/kuttl/common/assert-sample-deployment.yaml +++ b/tests/kuttl/common/assert-sample-deployment.yaml @@ -152,13 +152,13 @@ spec: designateAPI: replicas: 1 designateCentral: - replicas: 0 # backend needs to be configured + replicas: 1 designateWorker: - replicas: 0 # backend needs to be configured + replicas: 1 designateProducer: - replicas: 0 # backend needs to be configured + replicas: 1 designateBackendbind9: - replicas: 0 # backend needs to be configured + replicas: 1 barbican: enabled: true template: 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 e51e0ce5a..dee2a3440 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 @@ -152,13 +152,13 @@ spec: designateAPI: replicas: 1 designateCentral: - replicas: 0 # backend needs to be configured + replicas: 1 designateWorker: - replicas: 0 # backend needs to be configured + replicas: 1 designateProducer: - replicas: 0 # backend needs to be configured + replicas: 1 designateBackendbind9: - replicas: 0 # backend needs to be configured + replicas: 1 barbican: enabled: true template: 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 e99c26993..4d6a917a0 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 @@ -173,13 +173,13 @@ spec: designateAPI: replicas: 1 designateCentral: - replicas: 0 # backend needs to be configured + replicas: 1 designateWorker: - replicas: 0 # backend needs to be configured + replicas: 1 designateProducer: - replicas: 0 # backend needs to be configured + replicas: 1 designateBackendbind9: - replicas: 0 # backend needs to be configured + replicas: 1 barbican: enabled: true template: 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 5d05ed53e..117948ca0 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 @@ -152,13 +152,13 @@ spec: designateAPI: replicas: 1 designateCentral: - replicas: 0 # backend needs to be configured + replicas: 1 designateWorker: - replicas: 0 # backend needs to be configured + replicas: 1 designateProducer: - replicas: 0 # backend needs to be configured + replicas: 1 designateBackendbind9: - replicas: 0 # backend needs to be configured + replicas: 1 barbican: enabled: true template: 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 5d05ed53e..117948ca0 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 @@ -152,13 +152,13 @@ spec: designateAPI: replicas: 1 designateCentral: - replicas: 0 # backend needs to be configured + replicas: 1 designateWorker: - replicas: 0 # backend needs to be configured + replicas: 1 designateProducer: - replicas: 0 # backend needs to be configured + replicas: 1 designateBackendbind9: - replicas: 0 # backend needs to be configured + replicas: 1 barbican: enabled: true template: 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 b74b1c372..b3286e144 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 @@ -163,13 +163,13 @@ spec: designateAPI: replicas: 1 designateCentral: - replicas: 0 # backend needs to be configured + replicas: 1 designateWorker: - replicas: 0 # backend needs to be configured + replicas: 1 designateProducer: - replicas: 0 # backend needs to be configured + replicas: 1 designateBackendbind9: - replicas: 0 # backend needs to be configured + replicas: 1 barbican: enabled: true apiOverride: