From 182a199bf444985d0855edfa9dfc0a4172694ca7 Mon Sep 17 00:00:00 2001 From: OpenStack K8s CI Date: Sat, 16 Mar 2024 04:11:25 +0000 Subject: [PATCH] Update openstack-k8s-operators --- ....openstack.org_openstackcontrolplanes.yaml | 185 ++++++++---------- apis/go.mod | 46 ++--- apis/go.sum | 92 ++++----- ....openstack.org_openstackcontrolplanes.yaml | 185 ++++++++---------- go.mod | 60 +++--- go.sum | 120 ++++++------ 6 files changed, 321 insertions(+), 367 deletions(-) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index 8ce47be25..a82d5985c 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -414,11 +414,11 @@ spec: type: object customServiceConfig: type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: barbican type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -429,13 +429,9 @@ spec: type: object passwordSelectors: default: - database: BarbicanDatabasePassword service: BarbicanPassword simplecryptokek: BarbicanSimpleCryptoKEK properties: - database: - default: BarbicanDatabasePassword - type: string service: default: BarbicanPassword type: string @@ -5606,6 +5602,9 @@ spec: customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: ironic + type: string databaseInstance: type: string defaultConfigOverwrite: @@ -5848,6 +5847,9 @@ spec: customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: ironic-inspector + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -5938,12 +5940,8 @@ spec: type: object passwordSelectors: default: - database: IronicInspectorDatabasePassword service: IronicInspectorPassword properties: - database: - default: IronicInspectorDatabasePassword - type: string service: default: IronicInspectorPassword type: string @@ -6072,12 +6070,8 @@ spec: type: object passwordSelectors: default: - database: IronicDatabasePassword service: IronicPassword properties: - database: - default: IronicDatabasePassword - type: string service: default: IronicPassword type: string @@ -6519,11 +6513,11 @@ spec: customServiceConfig: default: '# add your customization here' type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: manila type: string + databaseInstance: + type: string dbPurge: properties: age: @@ -7552,12 +7546,8 @@ spec: type: object passwordSelectors: default: - database: ManilaDatabasePassword service: ManilaPassword properties: - database: - default: ManilaDatabasePassword - type: string service: default: ManilaPassword type: string @@ -7723,11 +7713,11 @@ spec: type: string customServiceConfig: type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: neutron type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -8552,12 +8542,8 @@ spec: type: object passwordSelectors: default: - database: NeutronDatabasePassword service: NeutronPassword properties: - database: - default: NeutronDatabasePassword - type: string service: default: NeutronPassword type: string @@ -8869,6 +8855,8 @@ spec: type: boolean template: properties: + apiContainerImageURL: + type: string apiDatabaseAccount: default: nova-api type: string @@ -8882,8 +8870,6 @@ spec: default: replicas: 1 properties: - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9018,8 +9004,6 @@ spec: type: string conductorServiceTemplate: properties: - containerImage: - type: string customServiceConfig: type: string networkAttachments: @@ -9088,8 +9072,6 @@ spec: type: string metadataServiceTemplate: properties: - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9200,8 +9182,6 @@ spec: type: object noVNCProxyServiceTemplate: properties: - containerImage: - type: string customServiceConfig: type: string enabled: @@ -9320,8 +9300,6 @@ spec: - ironic.IronicDriver - fake.FakeDriver type: string - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9391,18 +9369,22 @@ spec: cellMessageBusInstance: rabbitmq-cell1 hasAPIAccess: true type: object + computeContainerImageURL: + type: string + conductorContainerImageURL: + type: string keystoneInstance: default: keystone type: string memcachedInstance: default: memcached type: string + metadataContainerImageURL: + type: string metadataServiceTemplate: default: enabled: true properties: - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9515,6 +9497,8 @@ spec: additionalProperties: type: string type: object + novncproxyContainerImageURL: + type: string passwordSelectors: default: service: NovaPassword @@ -9529,12 +9513,12 @@ spec: preserveJobs: default: false type: boolean + schedulerContainerImageURL: + type: string schedulerServiceTemplate: default: replicas: 1 properties: - containerImage: - type: string customServiceConfig: type: string networkAttachments: @@ -9589,6 +9573,12 @@ spec: default: nova type: string required: + - apiContainerImageURL + - computeContainerImageURL + - conductorContainerImageURL + - metadataContainerImageURL + - novncproxyContainerImageURL + - schedulerContainerImageURL - secret type: object type: object @@ -9727,17 +9717,14 @@ spec: - name type: object type: array - certsSecret: - default: octavia-certs-secret - type: string customServiceConfig: default: '# add your customization here' type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: octavia type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -9765,13 +9752,13 @@ spec: customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -9837,7 +9824,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -9847,6 +9833,9 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string preserveJobs: default: false type: boolean @@ -9926,23 +9915,18 @@ spec: - name type: object type: array - certsPassphraseSecret: - default: octavia-ca-passphrase - type: string - certsSecret: - type: string containerImage: type: string customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -9969,7 +9953,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -9979,6 +9962,13 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string + redisHostIPs: + items: + type: string + type: array resources: properties: claims: @@ -10019,10 +10009,6 @@ spec: serviceUser: default: octavia type: string - sshPrivkeySecret: - type: string - sshPubkey: - type: string tenantName: default: service type: string @@ -10058,23 +10044,18 @@ spec: - name type: object type: array - certsPassphraseSecret: - default: octavia-ca-passphrase - type: string - certsSecret: - type: string containerImage: type: string customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -10101,7 +10082,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -10111,6 +10091,13 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string + redisHostIPs: + items: + type: string + type: array resources: properties: claims: @@ -10151,10 +10138,6 @@ spec: serviceUser: default: octavia type: string - sshPrivkeySecret: - type: string - sshPubkey: - type: string tenantName: default: service type: string @@ -10190,23 +10173,18 @@ spec: - name type: object type: array - certsPassphraseSecret: - default: octavia-ca-passphrase - type: string - certsSecret: - type: string containerImage: type: string customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -10233,7 +10211,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -10243,6 +10220,13 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string + redisHostIPs: + items: + type: string + type: array resources: properties: claims: @@ -10283,10 +10267,6 @@ spec: serviceUser: default: octavia type: string - sshPrivkeySecret: - type: string - sshPubkey: - type: string tenantName: default: service type: string @@ -10300,7 +10280,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -10310,6 +10289,9 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string preserveJobs: default: false type: boolean @@ -10328,7 +10310,6 @@ spec: default: octavia-ssh-pubkey type: string required: - - certsSecret - databaseInstance - octaviaAPI - rabbitMqClusterName @@ -15444,11 +15425,11 @@ spec: customServiceConfig: default: '# add your customization here' type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: aodh type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -15520,14 +15501,10 @@ spec: passwordSelector: default: aodhService: AodhPassword - database: AodhDatabasePassword properties: aodhService: default: AodhPassword type: string - database: - default: AodhDatabasePassword - type: string service: default: CeilometerPassword type: string @@ -15617,9 +15594,6 @@ spec: aodhService: default: AodhPassword type: string - database: - default: AodhDatabasePassword - type: string service: default: CeilometerPassword type: string @@ -16232,6 +16206,9 @@ 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]$ diff --git a/apis/go.mod b/apis/go.mod index f69f9c1a0..0f9147d3d 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -5,26 +5,26 @@ go 1.20 require ( github.com/onsi/ginkgo/v2 v2.16.0 github.com/onsi/gomega v1.31.1 - github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240305211912-95cf5d93d585 - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240306133639-c2e243349b80 + github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240310115941-5124bc86e50e + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240315185259-92a4d93fc876 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240306142853-6b5d6005953d - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240307055016-f66e43861199 - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240308113717-eaf5876d69c3 - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91 - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240310093110-b4b2614f40ba - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240306153230-dc65ab49ebc0 - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240306153230-dc65ab49ebc0 - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240305194401-0fda28a84acb - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240308170012-6b04e3e9b9ee - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240307151724-2fc1351673af - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240305155754-2dcd200b721a - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240307150054-826f3260f9aa - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240307105529-ab602118fd5d - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240307114522-1fa027839890 - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240311060559-4ecd4f5c3961 + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240314145536-52b38176eb3f + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240314023224-0eccb812f4bb + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240314112918-d4c8a3381866 + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240313161042-88282483a04f + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240315174418-d016dbadd829 + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240313143432-9108b7f7290a + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240314165949-fec16b14c33b + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240314165949-fec16b14c33b + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240315120315-d76653575db5 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240314113200-40cf3e6aa38e + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240315173603-b46bb3c0e4e5 + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240315160517-f7b35e4f7478 + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338 + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240315154317-8b38ff1e6a8d + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240315062222-959b50fdbd4b github.com/rabbitmq/cluster-operator/v2 v2.6.0 k8s.io/api v0.28.7 k8s.io/apimachinery v0.28.7 @@ -63,7 +63,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.20240306153230-dc65ab49ebc0 // indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240314165949-fec16b14c33b // 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 @@ -78,14 +78,14 @@ require ( golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/term v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.18.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/apis/go.sum b/apis/go.sum index 1aef8eb9a..5a8a109e4 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -73,48 +73,48 @@ github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240305211912-95cf5d93d585 h1:QAIvORdCcZ+Nbg3Jy0TAg8AR1xoEWTC8IwISGD4wdWc= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240305211912-95cf5d93d585/go.mod h1:BJoXL5gDpxJ4qCPKwfCjg6TG3Gm9cjeVA8qoDSFVBNI= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240306133639-c2e243349b80 h1:+rlsahNUHVjM3XvhqVtbIvfuU7Dgh8qRWSoRR0CUpkI= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240306133639-c2e243349b80/go.mod h1:j+ZW/9p2FGrVpo92t8KNTEVy4wWoVwVfTpVZxHRF/to= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240310115941-5124bc86e50e h1:bTwe7Vd6efGG5bQtVCcg5Vx+cI0PUcNQjeg0vOR28dk= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240310115941-5124bc86e50e/go.mod h1:/cGtVPIqIZY31DvNLVJGIDTn7q0mySia1H9+/uOyKxI= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240315185259-92a4d93fc876 h1:a+n5bxp4gKIVKVvJGd2Se1RB7/7czBqWYcArmv8KGu4= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240315185259-92a4d93fc876/go.mod h1:m4zXId1XjsKPacKBOYXs4Uvbvu8bhv0lxPy7xBFlRT4= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea h1:6E5uL2bqgsOxKuV0K58w5L98PoNVg+iExgTzsfZfP8s= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea/go.mod h1:6ogMzx/FQFtClz+tI+pdeb+8b3YtmQtxDGApBmMphVI= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240306142853-6b5d6005953d h1:l3p4Pz2WPqkx6X/P4VawaUyUBmwkeQIKEt31WnDJH1I= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240306142853-6b5d6005953d/go.mod h1:tsD3aiAwK5JyrrpP8wGCO2Sa3F78W9Ov9cHdCsPkzRs= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240307055016-f66e43861199 h1:w+bFX+oyK7h7bfa2yF1adoffcpb3ZXMRhZjwzd0Z2sE= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240307055016-f66e43861199/go.mod h1:63UcRnUoHAyeXwUJa/6tmphZf4ScoY2+s7ItDV+m3BQ= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996 h1:+wkmeYGCYfbA+hoAIdShomyptqoqyJ33VYUxUaJoAVA= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996/go.mod h1:Hzq/OQJ/CC2HeohMw7jh3eqQpIf3FEC2kQSw48bWV+s= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240308113717-eaf5876d69c3 h1:GJgS/TApDzvNj6lyEr1du6twi539QT2LOu5pqU0dZdA= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240308113717-eaf5876d69c3/go.mod h1:yPqJ+WU8jApuDXNUjpTxMafihuZpX3Yik9ZXqGaxYBQ= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91 h1:3yvrS33IOQibrXJJlVs/fDxLi5RCZlN5oDrR2c8aShk= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91/go.mod h1:Yac7wRClzl1/a7uBso4w8wq6Rjm+JLIouEsLre7VSDE= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240310093110-b4b2614f40ba h1:0wfKrQMGwjh/kKTH/UpZGKk91HrnReYieHFG73OC+Vg= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240310093110-b4b2614f40ba/go.mod h1:gB/IeXuvocAv0yNSf79U1lBHhbx6fdWUB501xFJ0l+A= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240306153230-dc65ab49ebc0 h1:1Q/9F3SAKvLN9vX+YxwaEB0WvBekj9eakQPoQbI1K6w= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240306153230-dc65ab49ebc0/go.mod h1:R2plZL2JdwDMJwv9+pkPmCB1Mww81J75G0MxRzi2Kug= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240306153230-dc65ab49ebc0 h1:HRoVOnK5nOSvYKU3Y2N8Ed2SikuRQYSRESeo/ILv0vM= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240306153230-dc65ab49ebc0/go.mod h1:vD2gy8bM6HkEY2unmpOXtwza515tUUucRP2IR0nffmU= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240306153230-dc65ab49ebc0 h1:9o0nbX808wq5ksmDCPG9tiuv9tYukCDpxXAAVsT55Nc= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240306153230-dc65ab49ebc0/go.mod h1:hKoDyLpp/Hc6fE1rYhlgXw8pYUPyRDKLgBrkAda5IPA= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240305194401-0fda28a84acb h1:CdhjKduaBLkpXfpg9CfVssrewBYnsfTztIC7WlurAWk= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240305194401-0fda28a84acb/go.mod h1:WjZonBUlokd/WM3bzlGqW0KncogYyxUDmWmKvxSPlLE= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240308170012-6b04e3e9b9ee h1:UYxzWJ1HixHQ+jPoZ/PeTqCUxVr1+kha4YJpV/UwL64= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240308170012-6b04e3e9b9ee/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f h1:/a/+8/2zx+GAr5urESTrxac71BDjeG6vYNEScUyytFg= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f/go.mod h1:gOepjTKpq6rF0Lf69edviPOjFpjw4LHan/tWC4LB4Fs= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240307151724-2fc1351673af h1:EuR34g9uahKG8YKp91FVvj5MNGR0Y+Q9aeu4Y3E8m+U= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240307151724-2fc1351673af/go.mod h1:RCAltxGRZ+fJd1Ouo5gInELLubDg2BW9dacm7jw7pzk= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240305155754-2dcd200b721a h1:lyrp4n/ao9oVCmvzfE8dIKIQvJnPlRlYi1nRguDyqMs= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240305155754-2dcd200b721a/go.mod h1:KXCbHFGtVwtnFIq8ZnpRA/gFSByXhANUpIJK8c9dqfs= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240307150054-826f3260f9aa h1:oJsV+c/dZwquGjF5oOd27j0J4gUizlJpydeaKbGe230= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240307150054-826f3260f9aa/go.mod h1:m7Hx4s5C6dubXQ2Qz8TH3SAj8SwdmrPSS5eKTDHb8gg= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240307105529-ab602118fd5d h1:34SBjighjnz9QP5pI0Kriv+3GZqI0WR/bkWE0Km9+Ks= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240307105529-ab602118fd5d/go.mod h1:PmT8kZ4JmtjHLAcsr9BNqD3gSSM9QrMLqokapSxaPJs= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240307114522-1fa027839890 h1:jW8UefyCC49Xj/BCMy0LrKPD9CvNivWNwaIHCzPuWis= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240307114522-1fa027839890/go.mod h1:GaoEq+SBg1xlafynZQEyK7wU0YMkajHEbig6J1CQjUo= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240311060559-4ecd4f5c3961 h1:YYeHx9q2/ohmCwezfdw+qDJywpSZVgo9Ud24Oyie2J4= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240311060559-4ecd4f5c3961/go.mod h1:QUHaxzPPQ1OzWvG8BJIE+D1LSpm+bdv2yfrXHXiYQ+4= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240314145536-52b38176eb3f h1:sDaGYd3+UeLWLAzgXm3Q4cQwSfDuAactmKUIWczd72Q= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240314145536-52b38176eb3f/go.mod h1:SDJ9an8x/15IUEH8lFBY4bnfMEbcnxQSjwjk32qG8bs= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240314023224-0eccb812f4bb h1:8AgWQC4sMzcouozSNY6BEw0PF8vhvsw6ney6K/LMvWA= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240314023224-0eccb812f4bb/go.mod h1:wfWDWgROdHmz5aMWhKjwUviIGe8BmkGs4Beu2Q6socE= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240314112918-d4c8a3381866 h1:Z23v4Or0RLEVXw6WZ2dGtuD+4I8j7fsVfOzoNpSFJQI= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240314112918-d4c8a3381866/go.mod h1:orzBY6ZnQ6Y3cDAC3ZwIg0KY41VhyanLz5TGAlowZHU= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240313161042-88282483a04f h1:gsvP3swGVUNPyFyxR5ZqOCoP3DTBnonDzYi7xSOhdAU= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240313161042-88282483a04f/go.mod h1:qKuzDDDMlAmJn4JWPoUeBEzpAia7J17++hhzR0oPv88= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240315174418-d016dbadd829 h1:SZzu5+nCVU2w0BPPe6VQiz2kccsrEghICay/hiR1wWc= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240315174418-d016dbadd829/go.mod h1:LnNsRscwuhOstzSuBZXAXi0iUUMLkafojSlEUBBfIPU= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240313143432-9108b7f7290a h1:XcUHh0j65hm8/4orLTH6aRTv3Ah4rGP1rA4yu7G0fR0= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240313143432-9108b7f7290a/go.mod h1:8C7VPKXAxiwB5Z4Kwn12VL0guW6onIG0Ayxiio5Vyu0= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240314165949-fec16b14c33b h1:5EzrrjcGziV69MsEgoBwPdsggY56M6jUxGBP9pp+hwo= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240314165949-fec16b14c33b/go.mod h1:DL+Ts0k+fzgZmx0XxWArIeAmdKuTkPa1I5DThdybfmE= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240314165949-fec16b14c33b h1:FEbadtLx4+ktxf79ZJoKZmfMNsQyqqgL5T9NXWc3i/k= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240314165949-fec16b14c33b/go.mod h1:ghnFgNIzj4amS897wEto+L+jYzDSg2cJ6y32RNfFGhk= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240314165949-fec16b14c33b h1:lygG1KiF5d9HpKpGAl5fa8JVlC9j5VFvC4iKvJkJslA= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240314165949-fec16b14c33b/go.mod h1:O5Cc9+++JnKewv8VWtTQeH5r2gPLy0lhdECfmjy7mF0= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240315120315-d76653575db5 h1:4xYbpsOFoS5t1h1VBuOCDiCWhv7Dgz10jGk2wLhzutA= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240315120315-d76653575db5/go.mod h1:802RCwt0cea6338iJUgrsEQ0+obtvVAdvDquIASJKEQ= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240314113200-40cf3e6aa38e h1:HUJV2Rd0NQZAXwV0UNdHKjO7fY5QLlDuLdI9f/OIc0Y= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240314113200-40cf3e6aa38e/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240315173603-b46bb3c0e4e5 h1:SSblOdDPH/RjHaO5xYtngs5rPW7+0wsBI4Xs23hhWJE= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240315173603-b46bb3c0e4e5/go.mod h1:oS8McJZ4junAxuRM2TI/OmegOr4l7OmqO9sFFJGrBK0= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb h1:WwiFdrd3Qk7AsXQWMIysL8LW4XHC9gJhJ4LmbIYi4HI= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb/go.mod h1:s9ZDTDlY5f7cu/ZT35kGYvLD8v6mto6MOLPcsK73e54= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d h1:Tg83hIGk29fYXPV/QICyFeAmamuD4v+2aQ87ZNi0R/k= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d/go.mod h1:w46sjTz5g4qxAd3xkEYTakmRoZOF8TfVr5WKG0vmPSw= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240315160517-f7b35e4f7478 h1:yLOKfe5Q27ZAHb+YGhtdjbjRn+3v16ROmWINbzxQetw= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240315160517-f7b35e4f7478/go.mod h1:FNShAZ4B+6fAKam4TjObbQCD2c9vc6UYoiGJPh1eCV8= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338 h1:4px3BVSfWmfvJf+Nurf0EJb4ViKHW4qM8ocDqH0u8C4= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338/go.mod h1:i7bl0Vg4iyaOR4GCfduMWq0V9k5h9ltKDnx0hZg1JDE= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240315154317-8b38ff1e6a8d h1:O4nJMsX3pS3X3CUw7/wjgJXoTIPA68pJowA1CfQP6IM= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240315154317-8b38ff1e6a8d/go.mod h1:/7+Ld3BHb9RDaHhXKEtCiWQmhVwpRLVeLutZxyHRPpM= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240315062222-959b50fdbd4b h1:74rvNVIoKTtvwI1jaTfA98eaMsA0kIGBQvREh1do3aY= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240315062222-959b50fdbd4b/go.mod h1:zy9gDiLYVf3ykBrA+Kxa4yDgt/USIaxEhwDTRm0/JB0= 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= @@ -183,12 +183,12 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -215,8 +215,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index 8ce47be25..a82d5985c 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -414,11 +414,11 @@ spec: type: object customServiceConfig: type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: barbican type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -429,13 +429,9 @@ spec: type: object passwordSelectors: default: - database: BarbicanDatabasePassword service: BarbicanPassword simplecryptokek: BarbicanSimpleCryptoKEK properties: - database: - default: BarbicanDatabasePassword - type: string service: default: BarbicanPassword type: string @@ -5606,6 +5602,9 @@ spec: customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: ironic + type: string databaseInstance: type: string defaultConfigOverwrite: @@ -5848,6 +5847,9 @@ spec: customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: ironic-inspector + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -5938,12 +5940,8 @@ spec: type: object passwordSelectors: default: - database: IronicInspectorDatabasePassword service: IronicInspectorPassword properties: - database: - default: IronicInspectorDatabasePassword - type: string service: default: IronicInspectorPassword type: string @@ -6072,12 +6070,8 @@ spec: type: object passwordSelectors: default: - database: IronicDatabasePassword service: IronicPassword properties: - database: - default: IronicDatabasePassword - type: string service: default: IronicPassword type: string @@ -6519,11 +6513,11 @@ spec: customServiceConfig: default: '# add your customization here' type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: manila type: string + databaseInstance: + type: string dbPurge: properties: age: @@ -7552,12 +7546,8 @@ spec: type: object passwordSelectors: default: - database: ManilaDatabasePassword service: ManilaPassword properties: - database: - default: ManilaDatabasePassword - type: string service: default: ManilaPassword type: string @@ -7723,11 +7713,11 @@ spec: type: string customServiceConfig: type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: neutron type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -8552,12 +8542,8 @@ spec: type: object passwordSelectors: default: - database: NeutronDatabasePassword service: NeutronPassword properties: - database: - default: NeutronDatabasePassword - type: string service: default: NeutronPassword type: string @@ -8869,6 +8855,8 @@ spec: type: boolean template: properties: + apiContainerImageURL: + type: string apiDatabaseAccount: default: nova-api type: string @@ -8882,8 +8870,6 @@ spec: default: replicas: 1 properties: - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9018,8 +9004,6 @@ spec: type: string conductorServiceTemplate: properties: - containerImage: - type: string customServiceConfig: type: string networkAttachments: @@ -9088,8 +9072,6 @@ spec: type: string metadataServiceTemplate: properties: - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9200,8 +9182,6 @@ spec: type: object noVNCProxyServiceTemplate: properties: - containerImage: - type: string customServiceConfig: type: string enabled: @@ -9320,8 +9300,6 @@ spec: - ironic.IronicDriver - fake.FakeDriver type: string - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9391,18 +9369,22 @@ spec: cellMessageBusInstance: rabbitmq-cell1 hasAPIAccess: true type: object + computeContainerImageURL: + type: string + conductorContainerImageURL: + type: string keystoneInstance: default: keystone type: string memcachedInstance: default: memcached type: string + metadataContainerImageURL: + type: string metadataServiceTemplate: default: enabled: true properties: - containerImage: - type: string customServiceConfig: type: string defaultConfigOverwrite: @@ -9515,6 +9497,8 @@ spec: additionalProperties: type: string type: object + novncproxyContainerImageURL: + type: string passwordSelectors: default: service: NovaPassword @@ -9529,12 +9513,12 @@ spec: preserveJobs: default: false type: boolean + schedulerContainerImageURL: + type: string schedulerServiceTemplate: default: replicas: 1 properties: - containerImage: - type: string customServiceConfig: type: string networkAttachments: @@ -9589,6 +9573,12 @@ spec: default: nova type: string required: + - apiContainerImageURL + - computeContainerImageURL + - conductorContainerImageURL + - metadataContainerImageURL + - novncproxyContainerImageURL + - schedulerContainerImageURL - secret type: object type: object @@ -9727,17 +9717,14 @@ spec: - name type: object type: array - certsSecret: - default: octavia-certs-secret - type: string customServiceConfig: default: '# add your customization here' type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: octavia type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -9765,13 +9752,13 @@ spec: customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -9837,7 +9824,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -9847,6 +9833,9 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string preserveJobs: default: false type: boolean @@ -9926,23 +9915,18 @@ spec: - name type: object type: array - certsPassphraseSecret: - default: octavia-ca-passphrase - type: string - certsSecret: - type: string containerImage: type: string customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -9969,7 +9953,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -9979,6 +9962,13 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string + redisHostIPs: + items: + type: string + type: array resources: properties: claims: @@ -10019,10 +10009,6 @@ spec: serviceUser: default: octavia type: string - sshPrivkeySecret: - type: string - sshPubkey: - type: string tenantName: default: service type: string @@ -10058,23 +10044,18 @@ spec: - name type: object type: array - certsPassphraseSecret: - default: octavia-ca-passphrase - type: string - certsSecret: - type: string containerImage: type: string customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -10101,7 +10082,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -10111,6 +10091,13 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string + redisHostIPs: + items: + type: string + type: array resources: properties: claims: @@ -10151,10 +10138,6 @@ spec: serviceUser: default: octavia type: string - sshPrivkeySecret: - type: string - sshPubkey: - type: string tenantName: default: service type: string @@ -10190,23 +10173,18 @@ spec: - name type: object type: array - certsPassphraseSecret: - default: octavia-ca-passphrase - type: string - certsSecret: - type: string containerImage: type: string customServiceConfig: default: '# add your customization here' type: string + databaseAccount: + default: octavia + type: string databaseHostname: type: string databaseInstance: type: string - databaseUser: - default: octavia - type: string defaultConfigOverwrite: additionalProperties: type: string @@ -10233,7 +10211,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -10243,6 +10220,13 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string + redisHostIPs: + items: + type: string + type: array resources: properties: claims: @@ -10283,10 +10267,6 @@ spec: serviceUser: default: octavia type: string - sshPrivkeySecret: - type: string - sshPubkey: - type: string tenantName: default: service type: string @@ -10300,7 +10280,6 @@ spec: type: object passwordSelectors: default: - database: OctaviaDatabasePassword service: OctaviaPassword properties: database: @@ -10310,6 +10289,9 @@ spec: default: OctaviaPassword type: string type: object + persistenceDatabaseAccount: + default: octavia-persistence + type: string preserveJobs: default: false type: boolean @@ -10328,7 +10310,6 @@ spec: default: octavia-ssh-pubkey type: string required: - - certsSecret - databaseInstance - octaviaAPI - rabbitMqClusterName @@ -15444,11 +15425,11 @@ spec: customServiceConfig: default: '# add your customization here' type: string - databaseInstance: - type: string - databaseUser: + databaseAccount: default: aodh type: string + databaseInstance: + type: string defaultConfigOverwrite: additionalProperties: type: string @@ -15520,14 +15501,10 @@ spec: passwordSelector: default: aodhService: AodhPassword - database: AodhDatabasePassword properties: aodhService: default: AodhPassword type: string - database: - default: AodhDatabasePassword - type: string service: default: CeilometerPassword type: string @@ -15617,9 +15594,6 @@ spec: aodhService: default: AodhPassword type: string - database: - default: AodhDatabasePassword - type: string service: default: CeilometerPassword type: string @@ -16232,6 +16206,9 @@ 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]$ diff --git a/go.mod b/go.mod index afdcb56dc..c26ff9452 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/blang/semver/v4 v4.0.0 - github.com/cert-manager/cert-manager v1.13.4 + github.com/cert-manager/cert-manager v1.13.5 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v1.4.1 github.com/google/uuid v1.6.0 @@ -12,31 +12,31 @@ require ( github.com/onsi/ginkgo/v2 v2.16.0 github.com/onsi/gomega v1.31.1 github.com/openshift/api v3.9.0+incompatible - github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240305211912-95cf5d93d585 - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240306133639-c2e243349b80 - github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240307144346-fdd88ea71261 + github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240310115941-5124bc86e50e + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240315185259-92a4d93fc876 + github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240315071715-308b1a7103ed github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240306142853-6b5d6005953d - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240307055016-f66e43861199 - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240308113717-eaf5876d69c3 - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91 - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240310093110-b4b2614f40ba - github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240313084555-12e3d33d7a2d - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240306153230-dc65ab49ebc0 - github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240306153230-dc65ab49ebc0 - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240305194401-0fda28a84acb - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240308170012-6b04e3e9b9ee - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240307151724-2fc1351673af - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240305155754-2dcd200b721a - github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240305134542-42210080a43a - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240306124145-51d0de73a123 + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240314145536-52b38176eb3f + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240314023224-0eccb812f4bb + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240314112918-d4c8a3381866 + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240313161042-88282483a04f + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240315174418-d016dbadd829 + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240313143432-9108b7f7290a + github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240314165949-fec16b14c33b + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240314165949-fec16b14c33b + github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240314165949-fec16b14c33b + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240315120315-d76653575db5 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240314113200-40cf3e6aa38e + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240315173603-b46bb3c0e4e5 + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d + github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240313103756-fb4ac5373b65 + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240315144007-c4efa711df03 github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-00010101000000-000000000000 - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240307150054-826f3260f9aa - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240307105529-ab602118fd5d - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240307114522-1fa027839890 - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240311060559-4ecd4f5c3961 + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240315160517-f7b35e4f7478 + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338 + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240315154317-8b38ff1e6a8d + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240315062222-959b50fdbd4b github.com/operator-framework/api v0.20.0 github.com/rabbitmq/cluster-operator/v2 v2.6.0 go.uber.org/zap v1.27.0 @@ -72,13 +72,13 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/metal3-io/baremetal-operator/apis v0.5.0 // indirect + github.com/metal3-io/baremetal-operator/apis v0.5.1 // indirect github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240306153230-dc65ab49ebc0 // indirect - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240306153230-dc65ab49ebc0 // indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240314165949-fec16b14c33b // indirect + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240314165949-fec16b14c33b // 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 @@ -93,14 +93,14 @@ require ( golang.org/x/mod v0.15.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/term v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.18.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 6ca88b401..989860843 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/cert-manager/cert-manager v1.13.4 h1:4zJdlemXg84KFssuk4I781oBJo1CuAnD1m8ZF/zsRrY= -github.com/cert-manager/cert-manager v1.13.4/go.mod h1:8F9nXyWuOP0Ziq77g0N5N/sTyfP1NBVs4C1GBjrDU1I= +github.com/cert-manager/cert-manager v1.13.5 h1:kSO9FnOQEuIox5FbtZnxWSSlYUV+7nBprL+U43YSnO0= +github.com/cert-manager/cert-manager v1.13.5/go.mod h1:4+c8TrwH3Q809Zxv6f8sgVbzdNcgOCl3sd55pr7r/EI= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -68,8 +68,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/metal3-io/baremetal-operator/apis v0.5.0 h1:IRaKMxRCkYfFAjvZdDyGC6bIaGQsV6MMNmGV8gqyYCc= -github.com/metal3-io/baremetal-operator/apis v0.5.0/go.mod h1:rjpH/E7MB7JWt/LPi6hDd5LpaBIiqaBnm3KtFjKxnUM= +github.com/metal3-io/baremetal-operator/apis v0.5.1 h1:l6VCuM2nSYMsdir3mocXvF80F7HnTXVZ7NNIoMEYbio= +github.com/metal3-io/baremetal-operator/apis v0.5.1/go.mod h1:Q3MHes59mRabjHM6ARoHfgd2uXUjJIytl3/uflzhyew= github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 h1:AnA8XLLp3RKYjjlB4KI0fyPSDN/d5gb3ZtM2cVyxwOc= github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -85,58 +85,58 @@ github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240305211912-95cf5d93d585 h1:QAIvORdCcZ+Nbg3Jy0TAg8AR1xoEWTC8IwISGD4wdWc= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240305211912-95cf5d93d585/go.mod h1:BJoXL5gDpxJ4qCPKwfCjg6TG3Gm9cjeVA8qoDSFVBNI= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240306133639-c2e243349b80 h1:+rlsahNUHVjM3XvhqVtbIvfuU7Dgh8qRWSoRR0CUpkI= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240306133639-c2e243349b80/go.mod h1:j+ZW/9p2FGrVpo92t8KNTEVy4wWoVwVfTpVZxHRF/to= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240307144346-fdd88ea71261 h1:XNwnizDNHIg/RsBRXcK8rU1hCfkzymUW+PoRXISZuw0= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240307144346-fdd88ea71261/go.mod h1:SMPkSrva1Qo/iO31DgCuLbC7jfNiKvOGvZz8v2/KOOA= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240310115941-5124bc86e50e h1:bTwe7Vd6efGG5bQtVCcg5Vx+cI0PUcNQjeg0vOR28dk= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240310115941-5124bc86e50e/go.mod h1:/cGtVPIqIZY31DvNLVJGIDTn7q0mySia1H9+/uOyKxI= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240315185259-92a4d93fc876 h1:a+n5bxp4gKIVKVvJGd2Se1RB7/7czBqWYcArmv8KGu4= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240315185259-92a4d93fc876/go.mod h1:m4zXId1XjsKPacKBOYXs4Uvbvu8bhv0lxPy7xBFlRT4= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240315071715-308b1a7103ed h1:vxTl65GAE6qrcaHZF8+KeYtlGEQLQWBsLmfTfMXuKbE= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240315071715-308b1a7103ed/go.mod h1:ilycIXn7RRKiMn5r2V+hX0jG7da21OhWFyq4JSulsDM= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea h1:6E5uL2bqgsOxKuV0K58w5L98PoNVg+iExgTzsfZfP8s= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea/go.mod h1:6ogMzx/FQFtClz+tI+pdeb+8b3YtmQtxDGApBmMphVI= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240306142853-6b5d6005953d h1:l3p4Pz2WPqkx6X/P4VawaUyUBmwkeQIKEt31WnDJH1I= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240306142853-6b5d6005953d/go.mod h1:tsD3aiAwK5JyrrpP8wGCO2Sa3F78W9Ov9cHdCsPkzRs= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240307055016-f66e43861199 h1:w+bFX+oyK7h7bfa2yF1adoffcpb3ZXMRhZjwzd0Z2sE= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240307055016-f66e43861199/go.mod h1:63UcRnUoHAyeXwUJa/6tmphZf4ScoY2+s7ItDV+m3BQ= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996 h1:+wkmeYGCYfbA+hoAIdShomyptqoqyJ33VYUxUaJoAVA= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996/go.mod h1:Hzq/OQJ/CC2HeohMw7jh3eqQpIf3FEC2kQSw48bWV+s= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240308113717-eaf5876d69c3 h1:GJgS/TApDzvNj6lyEr1du6twi539QT2LOu5pqU0dZdA= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240308113717-eaf5876d69c3/go.mod h1:yPqJ+WU8jApuDXNUjpTxMafihuZpX3Yik9ZXqGaxYBQ= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91 h1:3yvrS33IOQibrXJJlVs/fDxLi5RCZlN5oDrR2c8aShk= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91/go.mod h1:Yac7wRClzl1/a7uBso4w8wq6Rjm+JLIouEsLre7VSDE= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240310093110-b4b2614f40ba h1:0wfKrQMGwjh/kKTH/UpZGKk91HrnReYieHFG73OC+Vg= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240310093110-b4b2614f40ba/go.mod h1:gB/IeXuvocAv0yNSf79U1lBHhbx6fdWUB501xFJ0l+A= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240313084555-12e3d33d7a2d h1:IjMM7Ci7JkrefHtuMGkiB/A+xWKPMxJHG9yjr2SGH08= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240313084555-12e3d33d7a2d/go.mod h1:RV+rktKvegjYBQLuBKt8ax29UMqsU/D/sfSjQPr6XIs= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240306153230-dc65ab49ebc0 h1:1Q/9F3SAKvLN9vX+YxwaEB0WvBekj9eakQPoQbI1K6w= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240306153230-dc65ab49ebc0/go.mod h1:R2plZL2JdwDMJwv9+pkPmCB1Mww81J75G0MxRzi2Kug= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240306153230-dc65ab49ebc0 h1:HRoVOnK5nOSvYKU3Y2N8Ed2SikuRQYSRESeo/ILv0vM= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240306153230-dc65ab49ebc0/go.mod h1:vD2gy8bM6HkEY2unmpOXtwza515tUUucRP2IR0nffmU= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240306153230-dc65ab49ebc0 h1:9o0nbX808wq5ksmDCPG9tiuv9tYukCDpxXAAVsT55Nc= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240306153230-dc65ab49ebc0/go.mod h1:hKoDyLpp/Hc6fE1rYhlgXw8pYUPyRDKLgBrkAda5IPA= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240306153230-dc65ab49ebc0 h1:JH0VLFw5w9CnJnw7snDxkqRrTPHIPCyqk03ePlOpEa8= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240306153230-dc65ab49ebc0/go.mod h1:/ZkLOznBDxjChwIFFK3xg3EZ13WmZPP4ehu5wWy1T8E= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240305194401-0fda28a84acb h1:CdhjKduaBLkpXfpg9CfVssrewBYnsfTztIC7WlurAWk= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240305194401-0fda28a84acb/go.mod h1:WjZonBUlokd/WM3bzlGqW0KncogYyxUDmWmKvxSPlLE= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240308170012-6b04e3e9b9ee h1:UYxzWJ1HixHQ+jPoZ/PeTqCUxVr1+kha4YJpV/UwL64= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240308170012-6b04e3e9b9ee/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f h1:/a/+8/2zx+GAr5urESTrxac71BDjeG6vYNEScUyytFg= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f/go.mod h1:gOepjTKpq6rF0Lf69edviPOjFpjw4LHan/tWC4LB4Fs= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240307151724-2fc1351673af h1:EuR34g9uahKG8YKp91FVvj5MNGR0Y+Q9aeu4Y3E8m+U= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240307151724-2fc1351673af/go.mod h1:RCAltxGRZ+fJd1Ouo5gInELLubDg2BW9dacm7jw7pzk= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240305155754-2dcd200b721a h1:lyrp4n/ao9oVCmvzfE8dIKIQvJnPlRlYi1nRguDyqMs= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240305155754-2dcd200b721a/go.mod h1:KXCbHFGtVwtnFIq8ZnpRA/gFSByXhANUpIJK8c9dqfs= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240305134542-42210080a43a h1:p8Q2vvof6XLCcO4XNwGtxJFoGgbcWIlPe526vxM+Nt8= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240305134542-42210080a43a/go.mod h1:bl79/dzl+MXgLOvsardRuTMATDcqaAR6EK2fwHrS3wU= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240306124145-51d0de73a123 h1:RQ/xSmymnsW5grQtfKRKc4Lhc/YcacymOu4BEYR64ZA= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240306124145-51d0de73a123/go.mod h1:Hy/dPVUTo1/ixG4H49M+N1AVGagQYKeX9qkcT+EfyKs= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240307150054-826f3260f9aa h1:oJsV+c/dZwquGjF5oOd27j0J4gUizlJpydeaKbGe230= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240307150054-826f3260f9aa/go.mod h1:m7Hx4s5C6dubXQ2Qz8TH3SAj8SwdmrPSS5eKTDHb8gg= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240307105529-ab602118fd5d h1:34SBjighjnz9QP5pI0Kriv+3GZqI0WR/bkWE0Km9+Ks= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240307105529-ab602118fd5d/go.mod h1:PmT8kZ4JmtjHLAcsr9BNqD3gSSM9QrMLqokapSxaPJs= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240307114522-1fa027839890 h1:jW8UefyCC49Xj/BCMy0LrKPD9CvNivWNwaIHCzPuWis= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240307114522-1fa027839890/go.mod h1:GaoEq+SBg1xlafynZQEyK7wU0YMkajHEbig6J1CQjUo= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240311060559-4ecd4f5c3961 h1:YYeHx9q2/ohmCwezfdw+qDJywpSZVgo9Ud24Oyie2J4= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240311060559-4ecd4f5c3961/go.mod h1:QUHaxzPPQ1OzWvG8BJIE+D1LSpm+bdv2yfrXHXiYQ+4= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240314145536-52b38176eb3f h1:sDaGYd3+UeLWLAzgXm3Q4cQwSfDuAactmKUIWczd72Q= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240314145536-52b38176eb3f/go.mod h1:SDJ9an8x/15IUEH8lFBY4bnfMEbcnxQSjwjk32qG8bs= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240314023224-0eccb812f4bb h1:8AgWQC4sMzcouozSNY6BEw0PF8vhvsw6ney6K/LMvWA= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240314023224-0eccb812f4bb/go.mod h1:wfWDWgROdHmz5aMWhKjwUviIGe8BmkGs4Beu2Q6socE= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240314112918-d4c8a3381866 h1:Z23v4Or0RLEVXw6WZ2dGtuD+4I8j7fsVfOzoNpSFJQI= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240314112918-d4c8a3381866/go.mod h1:orzBY6ZnQ6Y3cDAC3ZwIg0KY41VhyanLz5TGAlowZHU= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240313161042-88282483a04f h1:gsvP3swGVUNPyFyxR5ZqOCoP3DTBnonDzYi7xSOhdAU= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240313161042-88282483a04f/go.mod h1:qKuzDDDMlAmJn4JWPoUeBEzpAia7J17++hhzR0oPv88= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240315174418-d016dbadd829 h1:SZzu5+nCVU2w0BPPe6VQiz2kccsrEghICay/hiR1wWc= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240315174418-d016dbadd829/go.mod h1:LnNsRscwuhOstzSuBZXAXi0iUUMLkafojSlEUBBfIPU= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240313143432-9108b7f7290a h1:XcUHh0j65hm8/4orLTH6aRTv3Ah4rGP1rA4yu7G0fR0= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240313143432-9108b7f7290a/go.mod h1:8C7VPKXAxiwB5Z4Kwn12VL0guW6onIG0Ayxiio5Vyu0= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240314165949-fec16b14c33b h1:Umvz8j2ySAAo7CbDIigCU9QcU1jywkkofNpjF4i3uKk= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240314165949-fec16b14c33b/go.mod h1:RV+rktKvegjYBQLuBKt8ax29UMqsU/D/sfSjQPr6XIs= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240314165949-fec16b14c33b h1:5EzrrjcGziV69MsEgoBwPdsggY56M6jUxGBP9pp+hwo= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240314165949-fec16b14c33b/go.mod h1:DL+Ts0k+fzgZmx0XxWArIeAmdKuTkPa1I5DThdybfmE= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240314165949-fec16b14c33b h1:FEbadtLx4+ktxf79ZJoKZmfMNsQyqqgL5T9NXWc3i/k= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240314165949-fec16b14c33b/go.mod h1:ghnFgNIzj4amS897wEto+L+jYzDSg2cJ6y32RNfFGhk= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240314165949-fec16b14c33b h1:lygG1KiF5d9HpKpGAl5fa8JVlC9j5VFvC4iKvJkJslA= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240314165949-fec16b14c33b/go.mod h1:O5Cc9+++JnKewv8VWtTQeH5r2gPLy0lhdECfmjy7mF0= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240314165949-fec16b14c33b h1:RJuOoa4KGWzE19r8s+9ht7OpWGjbfo4eNSbdmR94QhY= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240314165949-fec16b14c33b/go.mod h1:GVS3x9Z74SfM9YuzvxPP05+L2Z+X2rZjbtuijb9KuQE= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240315120315-d76653575db5 h1:4xYbpsOFoS5t1h1VBuOCDiCWhv7Dgz10jGk2wLhzutA= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240315120315-d76653575db5/go.mod h1:802RCwt0cea6338iJUgrsEQ0+obtvVAdvDquIASJKEQ= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240314113200-40cf3e6aa38e h1:HUJV2Rd0NQZAXwV0UNdHKjO7fY5QLlDuLdI9f/OIc0Y= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240314113200-40cf3e6aa38e/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240315173603-b46bb3c0e4e5 h1:SSblOdDPH/RjHaO5xYtngs5rPW7+0wsBI4Xs23hhWJE= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240315173603-b46bb3c0e4e5/go.mod h1:oS8McJZ4junAxuRM2TI/OmegOr4l7OmqO9sFFJGrBK0= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb h1:WwiFdrd3Qk7AsXQWMIysL8LW4XHC9gJhJ4LmbIYi4HI= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb/go.mod h1:s9ZDTDlY5f7cu/ZT35kGYvLD8v6mto6MOLPcsK73e54= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d h1:Tg83hIGk29fYXPV/QICyFeAmamuD4v+2aQ87ZNi0R/k= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d/go.mod h1:w46sjTz5g4qxAd3xkEYTakmRoZOF8TfVr5WKG0vmPSw= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240313103756-fb4ac5373b65 h1:AeHvh2ah7KDYmNF4Q9G8EKgaiuO4PRmK0B5dxLuASaY= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240313103756-fb4ac5373b65/go.mod h1:SONAy6PaXQfqSyx6/KuiUh0ZljeUi4wNoIhEFCkhiZU= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240315144007-c4efa711df03 h1:Z/91kuHBrAHsd2STO7NPtT9Lewh3IecTOXz9V13Tsv8= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240315144007-c4efa711df03/go.mod h1:VBiTU5t4StrJUYbGtVN0RPUl45DmC39eKjvXSLRF0hA= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240315160517-f7b35e4f7478 h1:yLOKfe5Q27ZAHb+YGhtdjbjRn+3v16ROmWINbzxQetw= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240315160517-f7b35e4f7478/go.mod h1:FNShAZ4B+6fAKam4TjObbQCD2c9vc6UYoiGJPh1eCV8= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338 h1:4px3BVSfWmfvJf+Nurf0EJb4ViKHW4qM8ocDqH0u8C4= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338/go.mod h1:i7bl0Vg4iyaOR4GCfduMWq0V9k5h9ltKDnx0hZg1JDE= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240315154317-8b38ff1e6a8d h1:O4nJMsX3pS3X3CUw7/wjgJXoTIPA68pJowA1CfQP6IM= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240315154317-8b38ff1e6a8d/go.mod h1:/7+Ld3BHb9RDaHhXKEtCiWQmhVwpRLVeLutZxyHRPpM= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240315062222-959b50fdbd4b h1:74rvNVIoKTtvwI1jaTfA98eaMsA0kIGBQvREh1do3aY= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240315062222-959b50fdbd4b/go.mod h1:zy9gDiLYVf3ykBrA+Kxa4yDgt/USIaxEhwDTRm0/JB0= github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4= github.com/operator-framework/api v0.20.0/go.mod h1:rXPOhrQ6mMeXqCmpDgt1ALoar9ZlHL+Iy5qut9R99a4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -213,12 +213,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -245,8 +245,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=