Merge branch 'openstack-k8s-operators:main' into tls-support-octavia

openstack-k8s-operators · Mar 27, 2024 · 63d2635 · 63d2635
2 parents a1d1a0f + 2fcb054
commit 63d2635
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -237,7 +237,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
-	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
 
 .PHONY: ginkgo
 ginkgo: $(GINKGO) ## Download ginkgo locally if necessary.

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
@@ -202,15 +202,15 @@ spec:
         replicas: 1
       designateWorker:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateProducer:
         replicas: 0
       designateMdns:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateBackendbind9:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml
@@ -183,15 +183,15 @@ spec:
         replicas: 1
       designateWorker:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateProducer:
         replicas: 0
       designateMdns:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateBackendbind9:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
@@ -387,15 +387,15 @@ spec:
         replicas: 1
       designateWorker:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateProducer:
         replicas: 0
       designateMdns:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateBackendbind9:
         replicas: 0
-        networkAttachements:
+        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
@@ -342,7 +342,7 @@ spec:
         ringReplicas: 1
       swiftStorage:
         replicas: 1
-        networkAttachements:
+        networkAttachments:
           - storage
       swiftProxy:
         replicas: 1
@@ -356,7 +356,7 @@ spec:
                   metallb.universe.tf/loadBalancerIPs: 172.17.0.80
               spec:
                 type: LoadBalancer
-        networkAttachements:
+        networkAttachments:
           - storage
   octavia:
     enabled: false
@@ -389,15 +389,15 @@ spec:
         replicas: 1
       designateWorker:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateProducer:
         replicas: 0
       designateMdns:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateBackendbind9:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
@@ -383,15 +383,15 @@ spec:
         replicas: 1
       designateWorker:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateProducer:
         replicas: 0
       designateMdns:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateBackendbind9:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml
@@ -419,15 +419,15 @@ spec:
         replicas: 1
       designateWorker:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateProducer:
         replicas: 0
       designateMdns:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateBackendbind9:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tlse.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tlse.yaml
@@ -386,15 +386,15 @@ spec:
         replicas: 1
       designateWorker:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateProducer:
         replicas: 0
       designateMdns:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate
       designateBackendbind9:
         replicas: 0
-        networkAttachements:
+        networkAttachments:
           - designate