Skip to content

Commit fcdbff5

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1153 from openstack-k8s-operators/add_designate_storage_replicas
[Designate] Add Bind9 storageRequest and replica count
2 parents bf8f09b + d7fbf74 commit fcdbff5

14 files changed

+65
-49
lines changed

‎config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,14 @@ spec:
199199
designateAPI:
200200
replicas: 1
201201
designateCentral:
202-
replicas: 0 # backend needs to be configured
202+
replicas: 1 # backend needs to be configured
203203
designateWorker:
204-
replicas: 0 # backend needs to be configured
204+
replicas: 1 # backend needs to be configured
205205
designateProducer:
206-
replicas: 0 # backend needs to be configured
206+
replicas: 1 # backend needs to be configured
207207
designateMdns:
208208
replicas: 0 # backend needs to be configured
209209
designateBackendbind9:
210-
replicas: 0 # backend needs to be configured
210+
replicas: 1 # backend needs to be configured
211+
storageClass: local-storage
212+
storageRequest: 10G

‎config/samples/core_v1beta1_openstackcontrolplane_galera.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,18 @@ spec:
226226
designateCentral:
227227
replicas: 1
228228
designateWorker:
229-
replicas: 0
229+
replicas: 1
230230
networkAttachments:
231231
- designate
232232
designateProducer:
233-
replicas: 0
233+
replicas: 1
234234
designateMdns:
235235
replicas: 0
236236
networkAttachments:
237237
- designate
238238
designateBackendbind9:
239-
replicas: 0
239+
replicas: 1
240+
storageClass: local-storage
241+
storageRequest: 10G
240242
networkAttachments:
241243
- designate

‎config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,19 @@ spec:
211211
designateCentral:
212212
replicas: 1
213213
designateWorker:
214-
replicas: 0
214+
replicas: 1
215215
networkAttachments:
216216
- designate
217217
designateProducer:
218-
replicas: 0
218+
replicas: 1
219219
designateMdns:
220220
replicas: 0
221221
networkAttachments:
222222
- designate
223223
designateBackendbind9:
224-
replicas: 0
224+
replicas: 1
225+
storageClass: local-storage
226+
storageRequest: 10G
225227
networkAttachments:
226228
- designate
227229
swift:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,16 +413,18 @@ spec:
413413
designateCentral:
414414
replicas: 1
415415
designateWorker:
416-
replicas: 0
416+
replicas: 1
417417
networkAttachments:
418418
- designate
419419
designateProducer:
420-
replicas: 0
420+
replicas: 1
421421
designateMdns:
422422
replicas: 0
423423
networkAttachments:
424424
- designate
425425
designateBackendbind9:
426-
replicas: 0
426+
replicas: 1
427+
storageClass: local-storage
428+
storageRequest: 10G
427429
networkAttachments:
428430
- designate

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,16 +415,18 @@ spec:
415415
designateCentral:
416416
replicas: 1
417417
designateWorker:
418-
replicas: 0
418+
replicas: 1
419419
networkAttachments:
420420
- designate
421421
designateProducer:
422-
replicas: 0
422+
replicas: 1
423423
designateMdns:
424424
replicas: 0
425425
networkAttachments:
426426
- designate
427427
designateBackendbind9:
428-
replicas: 0
428+
replicas: 1
429+
storageClass: local-storage
430+
storageRequest: 10G
429431
networkAttachments:
430432
- designate

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,16 +409,18 @@ spec:
409409
designateCentral:
410410
replicas: 1
411411
designateWorker:
412-
replicas: 0
412+
replicas: 1
413413
networkAttachments:
414414
- designate
415415
designateProducer:
416-
replicas: 0
416+
replicas: 1
417417
designateMdns:
418418
replicas: 0
419419
networkAttachments:
420420
- designate
421421
designateBackendbind9:
422-
replicas: 0
422+
replicas: 1
423+
storageClass: local-storage
424+
storageRequest: 10G
423425
networkAttachments:
424426
- designate

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,16 +434,18 @@ spec:
434434
designateCentral:
435435
replicas: 1
436436
designateWorker:
437-
replicas: 0
437+
replicas: 1
438438
networkAttachments:
439439
- designate
440440
designateProducer:
441-
replicas: 0
441+
replicas: 1
442442
designateMdns:
443443
replicas: 0
444444
networkAttachments:
445445
- designate
446446
designateBackendbind9:
447-
replicas: 0
447+
replicas: 1
448+
storageClass: local-storage
449+
storageRequest: 10G
448450
networkAttachments:
449451
- designate

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,16 +412,18 @@ spec:
412412
designateCentral:
413413
replicas: 1
414414
designateWorker:
415-
replicas: 0
415+
replicas: 1
416416
networkAttachments:
417417
- designate
418418
designateProducer:
419-
replicas: 0
419+
replicas: 1
420420
designateMdns:
421421
replicas: 0
422422
networkAttachments:
423423
- designate
424424
designateBackendbind9:
425-
replicas: 0
425+
replicas: 1
426+
storageClass: local-storage
427+
storageRequest: 10G
426428
networkAttachments:
427429
- designate

‎tests/kuttl/common/assert-sample-deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ spec:
152152
designateAPI:
153153
replicas: 1
154154
designateCentral:
155-
replicas: 0 # backend needs to be configured
155+
replicas: 1
156156
designateWorker:
157-
replicas: 0 # backend needs to be configured
157+
replicas: 1
158158
designateProducer:
159-
replicas: 0 # backend needs to be configured
159+
replicas: 1
160160
designateBackendbind9:
161-
replicas: 0 # backend needs to be configured
161+
replicas: 1
162162
barbican:
163163
enabled: true
164164
template:

‎tests/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ spec:
152152
designateAPI:
153153
replicas: 1
154154
designateCentral:
155-
replicas: 0 # backend needs to be configured
155+
replicas: 1
156156
designateWorker:
157-
replicas: 0 # backend needs to be configured
157+
replicas: 1
158158
designateProducer:
159-
replicas: 0 # backend needs to be configured
159+
replicas: 1
160160
designateBackendbind9:
161-
replicas: 0 # backend needs to be configured
161+
replicas: 1
162162
barbican:
163163
enabled: true
164164
template:

0 commit comments

Comments
 (0)