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

…ck-k8s-operators Update openstack-k8s-operators
openstack-k8s-operators · Apr 12, 2024 · a062109 · a062109
2 parents 0414bc0 + 2fcebd3
commit a062109
Show file tree

Hide file tree

Showing 10 changed files with 112 additions and 120 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -11058,10 +11058,6 @@ spec:
                             type: object
                           networkAttachment:
                             type: string
-                          networkAttachments:
-                            items:
-                              type: string
-                            type: array
                           nicMappings:
                             additionalProperties:
                               type: string
@@ -15759,8 +15755,8 @@ spec:
                           encryptionEnabled:
                             default: false
                             type: boolean
-                          memcachedServers:
-                            default: ""
+                          memcachedInstance:
+                            default: memcached
                             type: string
                           networkAttachments:
                             items:
@@ -15858,7 +15854,7 @@ spec:
                                 type: string
                             type: object
                         required:
-                        - memcachedServers
+                        - memcachedInstance
                         - rabbitMqClusterName
                         - replicas
                         - secret
@@ -15900,8 +15896,8 @@ spec:
                             additionalProperties:
                               type: string
                             type: object
-                          memcachedServers:
-                            default: ""
+                          memcachedInstance:
+                            default: memcached
                             type: string
                           networkAttachments:
                             items:
@@ -15919,7 +15915,7 @@ spec:
                             default: 10Gi
                             type: string
                         required:
-                        - memcachedServers
+                        - memcachedInstance
                         - replicas
                         - storageClass
                         - storageRequest
@@ -16338,7 +16334,7 @@ spec:
                                   aodhService:
                                     default: AodhPassword
                                     type: string
-                                  service:
+                                  ceilometerService:
                                     default: CeilometerPassword
                                     type: string
                                 type: object
@@ -16412,12 +16408,12 @@ spec:
                             type: array
                           passwordSelector:
                             default:
-                              service: CeilometerPassword
+                              ceilometerService: CeilometerPassword
                             properties:
                               aodhService:
                                 default: AodhPassword
                                 type: string
-                              service:
+                              ceilometerService:
                                 default: CeilometerPassword
                                 type: string
                             type: object

diff --git a/apis/go.mod b/apis/go.mod
@@ -8,23 +8,23 @@ require (
 	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d
 	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531
 	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767
-	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240403091918-407c91f5e7aa
-	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240404063020-d33c69bed5bd
+	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240409102624-b65521aa07e4
+	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240411002819-b89de06edd7c
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240403071259-b48a63e06810
-	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240408085033-bddcca32ce6e
-	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240407224322-0ac0a3eea830
+	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240409161822-d0ab878db2d8
+	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47
 	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240402154848-e5f862707f49
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240408095526-357d8fffa034
-	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240408095526-357d8fffa034
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240409150851-9a336392d3b2
+	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240409150851-9a336392d3b2
 	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240403143013-74e2f3cc4015
-	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240403152257-75b048d878bf
-	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240403141351-743a139e74b6
+	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240409152037-91b5c56dfc4a
+	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240409132013-b62679976372
 	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240404163736-a2d67e46f9f2
-	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240404073049-a8b012482299
-	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240409005731-765fc25c55d9
+	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240408184306-f4d50944f99d
+	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240411042149-e75b363fc851
 	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240404140050-69252e99daaf
-	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240405150212-f8cecba5f227
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240404090348-ab779da79e83
+	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240410220810-833995fece81
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240409214006-1fe1e9980488
 	github.com/rabbitmq/cluster-operator/v2 v2.6.0
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.69.0-rhobs1 // indirect
 	github.com/rhobs/observability-operator v0.0.28 // indirect
@@ -68,7 +68,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.20240404123425-54f145c97484 // indirect
+	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240409150851-9a336392d3b2 // 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

diff --git a/apis/go.sum b/apis/go.sum
@@ -79,44 +79,44 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4
 github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531/go.mod h1:ayvrE0oMzyA/AQDKpCqNT9uupRT0TqrSFXb1sjmvWqE=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767 h1:He5McazPpzOM00VkSpwK85oUq5JMHdjT8o26HxwQamc=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767/go.mod h1:SHv9v0wscyVv0yT3VD2UuPvw+kwRAEX/x/8fbnfZVpo=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240403091918-407c91f5e7aa h1:dH/2k//Y/U9SXiiaiqUVZveg08KkWWxg71bs2azhWrQ=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240403091918-407c91f5e7aa/go.mod h1:j575INOIXGXzSqmHp+BbqQFW6SPN8gaWJfQeB7iXVm0=
-github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240404063020-d33c69bed5bd h1:6I10IpH3Ln7Fz6uRXJLw2YahafgqjmRZrgrooaI+lGc=
-github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240404063020-d33c69bed5bd/go.mod h1:JrMWKpsXjX+jPH9A5tglZIDVmcBOFi0E5rV2cYj1GyQ=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240409102624-b65521aa07e4 h1:74i0VUwqPBqZd8ug0ahvdqOLuig9sePlEYywNWiJ1HM=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240409102624-b65521aa07e4/go.mod h1:C2ozqbmNbkMeGkb+NwS0z87poNQ2HdqWAzdjAzRlIPo=
+github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240411002819-b89de06edd7c h1:0hlIFxElsqUwMBjcmuRqvHv0McJLigywLFVSch0viSI=
+github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240411002819-b89de06edd7c/go.mod h1:oSvJ8bh9YouPoawJ9UaXXdg2vJuMn1frHfsZCXtYFuo=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240403071259-b48a63e06810 h1:6xbETho4txnfau3SLKUhzf50J7gAVdbECnzbBTlhPeg=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240403071259-b48a63e06810/go.mod h1:/qJz+SyeRDEcjwoGYBKb7DdYIWm5lUaCbpkaHnMhrwc=
-github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240408085033-bddcca32ce6e h1:6LYYB0FKVr1QUpPe25Zf7P/vowRifdDEnwQ492VT1XY=
-github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240408085033-bddcca32ce6e/go.mod h1:ii0O3I9B+mkX6/D8qDQjg/q76sojufkYhM7bq7qo41E=
-github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240407224322-0ac0a3eea830 h1:AVlco5EKURE26p3Ksxr7XAkMSxBrgeGa/9QiMmMvIIc=
-github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240407224322-0ac0a3eea830/go.mod h1:x1Hya2LM5fP3iD89Es9YDrG4vj+GIULLAdgxmv3NIvY=
+github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240409161822-d0ab878db2d8 h1:0uZLjBDtSXUaRhnHsjLqhGm/Cv7BN2v7T3Z5v/T3ndc=
+github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240409161822-d0ab878db2d8/go.mod h1:ii0O3I9B+mkX6/D8qDQjg/q76sojufkYhM7bq7qo41E=
+github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47 h1:uAvsVOH8a+u8ulgQ9EnjGP5TPtE2brHnYSQ4U/YI5AU=
+github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47/go.mod h1:qu/Kuk0zZNbdyAPCF1m+Amp9mU37ol2LyB+1Rvws948=
 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240402154848-e5f862707f49 h1:LSbLg+6iwX2jkVKe0ba6GqSO2mpoJlUZyWIWZA6jv6M=
 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240402154848-e5f862707f49/go.mod h1:opUQY0YZNCyA11FKLToVhaVZTTEMfbnf0ozOLmkKfGs=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240408095526-357d8fffa034 h1:HLI/aUA7KnBK5oLPIWXMasz7zqjal4GhNn1P/fdLI20=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240408095526-357d8fffa034/go.mod h1:gqByVGUdKQB/NkhKV4eD+8NWYkHq961nC96rTCB3ywE=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240404123425-54f145c97484 h1:0Wmtd+xyvPvU1O6xd2G27XwZfYY2ewhTrbd9ELHlHwg=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240404123425-54f145c97484/go.mod h1:U32T7Jz/vUBbMJVYuGSmhcPT2+WiOr+8zt2G9RPJGMI=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240408095526-357d8fffa034 h1:LDWJWy545zW7KsZ2d2d+J5mJJK5eX/pL7mnSqn63PH4=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240408095526-357d8fffa034/go.mod h1:/ieOXgiSRmc2LpZ9kCnvtXagh/QM88prKpisVNLwrjg=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240409150851-9a336392d3b2 h1:iMJlo74IgR0eZQvA8ehshcl7zHcuXBzTguMQnIvozcs=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240409150851-9a336392d3b2/go.mod h1:gqByVGUdKQB/NkhKV4eD+8NWYkHq961nC96rTCB3ywE=
+github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240409150851-9a336392d3b2 h1:8FsKQXfsirNgbjeVRZ8yVpwBQY4ZZqKv9brFSiw/gmM=
+github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240409150851-9a336392d3b2/go.mod h1:U32T7Jz/vUBbMJVYuGSmhcPT2+WiOr+8zt2G9RPJGMI=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240409150851-9a336392d3b2 h1:FNbC/wH0/lfFVfaLwZKTYYUnDUXKKkSNw3A2/cWyc9A=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240409150851-9a336392d3b2/go.mod h1:/ieOXgiSRmc2LpZ9kCnvtXagh/QM88prKpisVNLwrjg=
 github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240403143013-74e2f3cc4015 h1:IYvBU6uEbGb0zXqVjDW2DuXPmQBcEZ8ssc3xAOY2/FY=
 github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240403143013-74e2f3cc4015/go.mod h1:2xtchrVN1qkQcO2Xa2JkQLqBdYL7GRIUUsoiGLHK3OM=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240403152257-75b048d878bf h1:N0HGTE+WXkaVeCpsJO5QG79uyLhRuNa3/gCTGgfZfGo=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240403152257-75b048d878bf/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag=
-github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240403141351-743a139e74b6 h1:LshsR13dxHrFHDQu+o5XUmw4Tp5RWfvWRyzhVZX9dmg=
-github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240403141351-743a139e74b6/go.mod h1:Vovoen6t/3EqsoeLn70eSVzpKbVZuKwX4KWkZbw3vfM=
+github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240409152037-91b5c56dfc4a h1:mEy+iOVsjCmJZKluNww1TuUcj9Av5O4YWFXX5tsopts=
+github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240409152037-91b5c56dfc4a/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag=
+github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240409132013-b62679976372 h1:Xud/yLk8KNOefTYE8957/3sycprA7H0wUWCgU53JcvE=
+github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240409132013-b62679976372/go.mod h1:iA/flM2a8U+wIT9QNC+mZxQsiebhOOlLv7qpCcHFrME=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240404163736-a2d67e46f9f2 h1:bsWovRNUDpUpXtuvnyxzCH4TH8l2DW+mbbbTfQFlvO0=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240404163736-a2d67e46f9f2/go.mod h1:qTPC7HGMWkxan3Z3YD5/cgw8kWraEW5ikdrKZ76XpBw=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240404073049-a8b012482299 h1:G53Kd5koCQn0nUfAvEcvkDZ4ik885sXuuG+5nazdQXA=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240404073049-a8b012482299/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8=
-github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240409005731-765fc25c55d9 h1:8Qx/czqE2YAkR3TIFGuluPfVGrQpwtxmlEbxrWbw25M=
-github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240409005731-765fc25c55d9/go.mod h1:geYtiRKn+GKR61YhAMsvPvLqVdMb4wtvMrj1kFG0SdU=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240408184306-f4d50944f99d h1:LJsJxX4ukD/h8QIRQtDJ3f55Ic2Rnl9Wy6dzEwvwkA4=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240408184306-f4d50944f99d/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8=
+github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240411042149-e75b363fc851 h1:ZLMRfMwD6mUfrxH0YohYIeZrcq7AQVrb+zOkq8MpA64=
+github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240411042149-e75b363fc851/go.mod h1:geYtiRKn+GKR61YhAMsvPvLqVdMb4wtvMrj1kFG0SdU=
 github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240404140050-69252e99daaf h1:O7RzcKH3qRORucojkKZc1vIpQv5naYoWn34zhVzTs0E=
 github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240404140050-69252e99daaf/go.mod h1:NYOgk2HS4mSR+4WwsiexepNU1pjxeo7h2WTs8qtS9/0=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f h1:wWaOCAkCym4t+NZWXYT/LErGhKujDdKgc7Qy/3vX4uU=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis=
-github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240405150212-f8cecba5f227 h1:aX8lFcr9d7SzsP9MUvHzrki1jUPqYbAFlfdlu4OWxl0=
-github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240405150212-f8cecba5f227/go.mod h1:kl+TdEExQwr7OCZaOilotlGlz9rzGxC75rUBL0P35f8=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240404090348-ab779da79e83 h1:/YiMXzTLTehsSlDHliiJiDr3n/j1krxRHlP0A2ca41k=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240404090348-ab779da79e83/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240410220810-833995fece81 h1:MpIYx4MAZwyyHxAOsaUk68JIumC3+H7ggRxiUH8dyic=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240410220810-833995fece81/go.mod h1:bhh994o69xj+ZkYGMEfxXMgkv/Va28Td+RDTqQqbbLY=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240409214006-1fe1e9980488 h1:TxH7rENG3U2BfZ9fQVjUrcextcnA56Wlet6u7LpBl9M=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240409214006-1fe1e9980488/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=