update finalzier to CRD doc

Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/barbican-operator#125 Depends-On: openstack-k8s-operators/cinder-operator#402 Depends-On: openstack-k8s-operators/designate-operator#178 Depends-On: openstack-k8s-operators/glance-operator#559 Depends-On: openstack-k8s-operators/heat-operator#380 Depends-On: openstack-k8s-operators/horizon-operator#332 Depends-On: openstack-k8s-operators/infra-operator#231 Depends-On: openstack-k8s-operators/ironic-operator#440 Depends-On: openstack-k8s-operators/keystone-operator#428 Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/manila-operator#287 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/neutron-operator#366 Depends-On: openstack-k8s-operators/nova-operator#794 Depends-On: openstack-k8s-operators/octavia-operator#330 Depends-On: openstack-k8s-operators/openstack-baremetal-operator#180 Depends-On: openstack-k8s-operators/ovn-operator#309 Depends-On: openstack-k8s-operators/placement-operator#215 Depends-On: openstack-k8s-operators/swift-operator#231 Depends-On: openstack-k8s-operators/telemetry-operator#414 Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
stuggi · Jun 19, 2024 · 34c8666 · 34c8666
1 parent b89dec8
commit 34c8666
Show file tree

Hide file tree

Showing 8 changed files with 168 additions and 145 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -4373,8 +4373,6 @@ spec:
                                     type: object
                                   type: object
                               type: object
-                            pvc:
-                              type: string
                             replicas:
                               default: 1
                               format: int32
@@ -4412,10 +4410,15 @@ spec:
                                     x-kubernetes-int-or-string: true
                                   type: object
                               type: object
-                            storageClass:
-                              type: string
-                            storageRequest:
-                              type: string
+                            storage:
+                              properties:
+                                external:
+                                  type: boolean
+                                storageClass:
+                                  type: string
+                                storageRequest:
+                                  type: string
+                              type: object
                             tls:
                               properties:
                                 api:
@@ -4443,7 +4446,6 @@ spec:
                               type: string
                           required:
                           - containerImage
-                          - storageRequest
                           type: object
                         type: object
                       imageCache:
@@ -4506,18 +4508,22 @@ spec:
                       serviceUser:
                         default: glance
                         type: string
-                      storageClass:
-                        type: string
-                      storageRequest:
-                        type: string
+                      storage:
+                        properties:
+                          external:
+                            type: boolean
+                          storageClass:
+                            type: string
+                          storageRequest:
+                            type: string
+                        type: object
                     required:
                     - databaseInstance
                     - glanceAPIs
                     - imageCache
                     - keystoneEndpoint
                     - memcachedInstance
                     - secret
-                    - storageRequest
                     type: object
                 type: object
               heat:

diff --git a/apis/go.mod b/apis/go.mod
@@ -7,26 +7,26 @@ require (
 	github.com/go-playground/validator/v10 v10.22.0
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054
-	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f
-	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b
+	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240619095200-b42b011211df
+	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240619145716-e6f7008174d3
+	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240619094058-aa8505803e88
 	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0
-	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0
-	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f
-	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76
-	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240617151404-d91e8253e159
-	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658
+	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240619151918-b0834d823735
+	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240619143516-7e487e49906e
+	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240619095729-12880d8dcd1a
+	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240619143011-b4ca00d278c3
+	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240619130146-b17a4c95ef7d
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658
 	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240617071525-810dcd87f715
-	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d
-	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240617051141-0f11eeae5551
-	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240618042617-76df83782bee
+	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61
+	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240619144047-f156aa49471a
+	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240619091610-e9f5a93a7ee1
 	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240617144925-7e66f41e25b7
-	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240617061743-3d9d8de89185
-	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240617061743-5f2e00117024
-	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240617142146-ec06106bbc15
-	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240617073156-f03281e75417
+	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240619085411-bef49bac48ba
+	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240619135645-867a324eb196
+	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240619143517-c17fa31548a9
+	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240619062540-252083b90a7c
 	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240617135419-de45c322372c
 	github.com/rabbitmq/cluster-operator/v2 v2.6.0
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.69.0-rhobs1 // indirect
@@ -116,3 +116,11 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430
 
 // custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
 replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240612145157-629e537392b3 //allow-merging
+
+replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20240619055204-dba8b082243c
+
+replace github.com/openstack-k8s-operators/manila-operator/api => github.com/stuggi/manila-operator/api v0.0.0-20240619055915-e1faf674a5fa
+
+replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/stuggi/octavia-operator/api v0.0.0-20240619060727-cbbfb96d7b18
+
+replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/stuggi/telemetry-operator/api v0.0.0-20240619062407-d70a41985e03