Update openstack-k8s-operators

openstack-k8s-operators · Dec 17, 2023 · b7eb168 · b7eb168
1 parent aa63bf3
commit b7eb168
Show file tree

Hide file tree

Showing 6 changed files with 161 additions and 173 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -9895,7 +9895,11 @@ spec:
                         type: object
                       octaviaHealthManager:
                         properties:
+                          certspassphrasesecret:
+                            default: octavia-ca-passphrase
+                            type: string
                           certssecret:
+                            default: octavia-certs-secret
                             type: string
                           containerImage:
                             type: string
@@ -9945,12 +9949,6 @@ spec:
                                 default: OctaviaPassword
                                 type: string
                             type: object
-                          replicas:
-                            default: 1
-                            format: int32
-                            maximum: 32
-                            minimum: 0
-                            type: integer
                           resources:
                             properties:
                               claims:
@@ -10005,7 +10003,11 @@ spec:
                         type: object
                       octaviaHousekeeping:
                         properties:
+                          certspassphrasesecret:
+                            default: octavia-ca-passphrase
+                            type: string
                           certssecret:
+                            default: octavia-certs-secret
                             type: string
                           containerImage:
                             type: string
@@ -10055,12 +10057,6 @@ spec:
                                 default: OctaviaPassword
                                 type: string
                             type: object
-                          replicas:
-                            default: 1
-                            format: int32
-                            maximum: 32
-                            minimum: 0
-                            type: integer
                           resources:
                             properties:
                               claims:
@@ -10115,7 +10111,11 @@ spec:
                         type: object
                       octaviaWorker:
                         properties:
+                          certspassphrasesecret:
+                            default: octavia-ca-passphrase
+                            type: string
                           certssecret:
+                            default: octavia-certs-secret
                             type: string
                           containerImage:
                             type: string
@@ -10165,12 +10165,6 @@ spec:
                                 default: OctaviaPassword
                                 type: string
                             type: object
-                          replicas:
-                            default: 1
-                            format: int32
-                            maximum: 32
-                            minimum: 0
-                            type: integer
                           resources:
                             properties:
                               claims:
@@ -15228,19 +15222,13 @@ spec:
                           heatInstance:
                             default: heat
                             type: string
-                          prometheus:
-                            properties:
-                              deployPrometheus:
-                                default: false
-                                type: boolean
-                              host:
-                                type: string
-                              port:
-                                format: int32
-                                maximum: 65535
-                                minimum: 1
-                                type: integer
-                            type: object
+                          prometheusHost:
+                            type: string
+                          prometheusPort:
+                            format: int32
+                            maximum: 65535
+                            minimum: 1
+                            type: integer
                         required:
                         - heatInstance
                         type: object

diff --git a/apis/go.mod b/apis/go.mod
@@ -5,25 +5,25 @@ go 1.19
 require (
 	github.com/onsi/ginkgo/v2 v2.13.2
 	github.com/onsi/gomega v1.30.0
-	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231207160658-3b1359af5f52
-	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231208230042-a3f120021b62
+	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231215133343-b99995bf113d
+	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231217115808-31de85a845a8
 	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231205132751-b5000faad819
 	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231215121058-9d0a5762fadd
-	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231212061843-87c824741b45
+	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231217233353-cc4159708cf0
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231212041209-95729f0f09ae
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231211112757-94d545047df2
 	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54
 	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231208104910-f8433c1c9399
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231209173030-f7a552f208e7
-	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231212090056-0da4204a8662
-	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231205003453-c971bdd03386
-	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231206091318-5f09d2fd3c1b
-	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231211113616-4d9a55566331
-	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231207200317-cdbdd42844b8
-	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231211163103-dfb4859c9848
-	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231210161825-4daf37ecb2bb
-	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231130161451-e5ca233aa206
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231212092541-76f6f1e20cd0
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231215134849-9acca0025036
+	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231217223322-f0cb4bf63055
+	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231214220541-4cd7b3f5eede
+	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231215055411-7617eff48c5d
+	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231216115953-fc6e3ca924e5
+	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231215145844-b68aa0584700
+	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231214144747-4931187a1a31
+	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231215212814-3f7cf6cffa10
+	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231215071649-fadabb2af9c8
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231215113230-4d5a1f8ef4f4
 	github.com/rabbitmq/cluster-operator/v2 v2.5.0
 	k8s.io/apimachinery v0.27.4
 	sigs.k8s.io/controller-runtime v0.15.1
@@ -33,6 +33,8 @@ require (
 	github.com/go-logr/zapr v1.2.4 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
+	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 // indirect
+	github.com/rhobs/observability-operator v0.0.20 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
@@ -56,7 +58,7 @@ require (
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/gophercloud/gophercloud v1.8.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -67,8 +69,8 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/openshift/api v3.9.0+incompatible // indirect
-	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231209173030-f7a552f208e7 //indirect
-	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231209173030-f7a552f208e7
+	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231215134849-9acca0025036 //indirect
+	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231215134849-9acca0025036
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect