Merge pull request #924 from openstack-k8s-operators/renovate/opensta…

…ck-k8s-operators Update openstack-k8s-operators
openstack-k8s-operators · Jul 13, 2024 · 38c9a63 · 38c9a63
2 parents adfbfd5 + cedb5c4
commit 38c9a63
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 162 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -3360,6 +3360,8 @@ spec:
                           type: string
                         disableNonTLSListeners:
                           type: boolean
+                        logToDisk:
+                          type: boolean
                         nodeSelector:
                           additionalProperties:
                             type: string
@@ -17076,6 +17078,13 @@ spec:
                                 pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                                 type: string
                             type: object
+                          dashboardsEnabled:
+                            default: false
+                            type: boolean
+                          dataplaneNetwork:
+                            default: ctlplane
+                            pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$
+                            type: string
                           enabled:
                             default: false
                             type: boolean
@@ -17085,13 +17094,6 @@ spec:
                               alertingEnabled:
                                 default: true
                                 type: boolean
-                              dashboardsEnabled:
-                                default: false
-                                type: boolean
-                              dataplaneNetwork:
-                                default: ctlplane
-                                pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$
-                                type: string
                               scrapeInterval:
                                 default: 30s
                                 type: string
@@ -17143,8 +17145,6 @@ spec:
                                     - persistent
                                     type: string
                                 type: object
-                            required:
-                            - dataplaneNetwork
                             type: object
                           prometheusTls:
                             properties:

diff --git a/apis/go.mod b/apis/go.mod
@@ -7,27 +7,27 @@ 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-20240705080032-2a515074bcea
-	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240705075807-be7803a42d75
-	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240704231514-c2b1728e46b7
-	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240707065058-26631ed517b9
-	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240704231515-a1bb7731fd73
-	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240704220914-63a9fd21e69b
-	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240704231227-c7ee9d3de988
-	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240704220915-746cf7c339c5
-	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240704220917-e65444cf5f26
+	github.com/openstack-k8s-operators/barbican-operator/api v0.4.1-0.20240710152410-5c05e41b7e9b
+	github.com/openstack-k8s-operators/cinder-operator/api v0.4.1-0.20240709170501-8cdb9c68d2b2
+	github.com/openstack-k8s-operators/designate-operator/api v0.1.1-0.20240710142627-ffb0d2e17901
+	github.com/openstack-k8s-operators/glance-operator/api v0.4.1-0.20240709223740-c89e146eceaf
+	github.com/openstack-k8s-operators/heat-operator/api v0.4.1-0.20240709172131-7d58c1869913
+	github.com/openstack-k8s-operators/horizon-operator/api v0.4.1-0.20240709161926-bb518cf22192
+	github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240710144010-493348a1e882
+	github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20240710183123-6fe249a4f5c9
+	github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240710140425-fcaeeb81f955
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240709153313-544a55696489
-	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240624132705-6c8da3c0bbfd
-	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240704201628-8bd806665c0f
-	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240704221159-db920d37527a
-	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240704221200-3f5964b57e32
-	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240704191845-3ace225b81d5
-	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240704173130-75793ce6429c
-	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240704221200-e36b4925add5
-	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240705005943-39edd4414c95
-	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240704164502-7a8d9b50869c
-	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240704182345-5399100dea21
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240705105058-bfaba15f3ed7
+	github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240709153313-544a55696489
+	github.com/openstack-k8s-operators/manila-operator/api v0.4.1-0.20240709193330-9a4542799676
+	github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240709192759-bdbac5dca561
+	github.com/openstack-k8s-operators/neutron-operator/api v0.4.1-0.20240710193154-26495b739566
+	github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20240710014205-232a1f1b9ef3
+	github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20240710144009-a68dbd60baf8
+	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20240710123341-f09e275d360e
+	github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20240710183926-15f69cfd799a
+	github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240709175959-67b6081903f2
+	github.com/openstack-k8s-operators/swift-operator/api v0.4.1-0.20240710110546-d0117f2a5b92
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.4.1-0.20240711093329-444880667000
 	github.com/rabbitmq/cluster-operator/v2 v2.9.0
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.69.0-rhobs1 // indirect
 	github.com/rhobs/observability-operator v0.0.28 // indirect
@@ -79,7 +79,7 @@ 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.20240624132705-6c8da3c0bbfd // indirect
+	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240709153313-544a55696489 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
@@ -115,4 +115,4 @@ require (
 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
 
 // 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.20240626194327-e7df1b654cb7 //allow-merging
+replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240711055119-1e6b9b8d9bd0 //allow-merging