From 5eb5c99c85d517b8dd6af3224b6ad904b02c6c6e Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Sat, 2 Dec 2023 07:30:01 +0100 Subject: [PATCH] Add list of glanceAPI support This change aligns the openstack-operator with the work done in the glance-operator to support the deployment of a list of glanceAPI. The logic has been improved to make sure the new CRD is supported. Signed-off-by: Francesco Pantano --- ....openstack.org_openstackcontrolplanes.yaml | 304 ++++++++++-------- apis/go.mod | 34 +- apis/go.sum | 64 ++-- ....openstack.org_openstackcontrolplanes.yaml | 304 ++++++++++-------- .../core_v1beta1_openstackcontrolplane.yaml | 7 +- ..._openstackcontrolplane_collapsed_cell.yaml | 7 +- ..._v1beta1_openstackcontrolplane_galera.yaml | 7 +- ...penstackcontrolplane_galera_3replicas.yaml | 7 +- ...controlplane_galera_network_isolation.yaml | 31 +- ...ne_galera_network_isolation_3replicas.yaml | 31 +- ...enstackcontrolplane_network_isolation.yaml | 31 +- ...ckcontrolplane_network_isolation_ceph.yaml | 29 +- go.mod | 44 +-- go.sum | 84 ++--- pkg/openstack/glance.go | 43 +-- 15 files changed, 541 insertions(+), 486 deletions(-) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index 34c0a28ae..0611458ad 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -648,6 +648,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -762,6 +766,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -825,6 +833,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -889,6 +901,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -945,25 +961,16 @@ spec: databaseUser: default: cinder type: string - dbPurge: - properties: - age: - default: 30 - minimum: 1 - type: integer - schedule: - default: 1 0 * * * - type: string - type: object debug: properties: - dbPurge: - default: false - type: boolean dbSync: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object extraMounts: items: properties: @@ -4506,137 +4513,142 @@ spec: - extraVol type: object type: array - glanceAPI: - properties: - containerImage: - type: string - customServiceConfig: - type: string - customServiceConfigSecrets: - items: - type: string - type: array - debug: - properties: - service: - default: false - type: boolean - type: object - networkAttachments: - items: + glanceAPIs: + additionalProperties: + properties: + containerImage: type: string - type: array - nodeSelector: - additionalProperties: + customServiceConfig: type: string - type: object - override: - properties: - service: - additionalProperties: - properties: - endpointURL: - type: string - metadata: - properties: - annotations: - additionalProperties: + customServiceConfigSecrets: + items: + type: string + type: array + debug: + properties: + service: + default: false + type: boolean + type: object + networkAttachments: + items: + type: string + type: array + nodeSelector: + additionalProperties: + type: string + type: object + override: + properties: + service: + additionalProperties: + properties: + endpointURL: + type: string + metadata: + properties: + annotations: + additionalProperties: + type: string + type: object + labels: + additionalProperties: + type: string + type: object + type: object + spec: + properties: + externalName: type: string - type: object - labels: - additionalProperties: + externalTrafficPolicy: type: string - type: object - type: object - spec: - properties: - externalName: - type: string - externalTrafficPolicy: - type: string - internalTrafficPolicy: - type: string - ipFamilyPolicy: - type: string - loadBalancerClass: - type: string - loadBalancerSourceRanges: - items: + internalTrafficPolicy: type: string - type: array - sessionAffinity: - type: string - sessionAffinityConfig: - properties: - clientIP: - properties: - timeoutSeconds: - format: int32 - type: integer - type: object - type: object - type: - type: string - type: object + ipFamilyPolicy: + type: string + loadBalancerClass: + type: string + loadBalancerSourceRanges: + items: + type: string + type: array + sessionAffinity: + type: string + sessionAffinityConfig: + properties: + clientIP: + properties: + timeoutSeconds: + format: int32 + type: integer + type: object + type: object + type: + type: string + type: object + type: object type: object - type: object - type: object - pvc: - type: string - replicas: - default: 1 - format: int32 - maximum: 32 - minimum: 0 - type: integer - resources: - properties: - claims: - items: - properties: - name: - type: string - required: + type: object + pvc: + type: string + replicas: + default: 1 + format: int32 + maximum: 32 + minimum: 0 + type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true type: object - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - type: object - storageClass: - type: string - storageRequest: - type: string - type: - default: split - enum: - - split - - single - type: string - required: - - containerImage - - storageRequest + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + storageClass: + type: string + storageRequest: + type: string + type: + default: split + enum: + - split + - single + - edge + type: string + required: + - containerImage + - storageRequest + type: object type: object imageCacheSize: default: "" type: string + keystoneEndpoint: + type: string nodeSelector: additionalProperties: type: string @@ -4688,8 +4700,9 @@ spec: required: - containerImage - databaseInstance - - glanceAPI + - glanceAPIs - imageCacheSize + - keystoneEndpoint - secret - storageRequest type: object @@ -6616,15 +6629,6 @@ spec: databaseUser: default: manila type: string - dbPurge: - properties: - age: - default: 30 - type: integer - schedule: - default: 1 0 * * * - type: string - type: object debug: properties: dbPurge: @@ -6634,6 +6638,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object extraMounts: items: properties: @@ -7407,6 +7415,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -7523,6 +7535,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -7589,6 +7605,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string diff --git a/apis/go.mod b/apis/go.mod index d7546308d..26bdeb29a 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -6,20 +6,20 @@ require ( github.com/onsi/ginkgo/v2 v2.13.2 github.com/onsi/gomega v1.30.0 github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231122193628-96ca1e05d8ad - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231124170114-3771599a828e - github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231126175241-a71b6613629e - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231129103834-0b292f39b018 - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231126231141-b59990d87301 - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231127063959-58a687bf0bb4 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231122104142-3b449040167e - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54 + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231121084647-689b50f424d8 + github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231121201004-def8670ef7e9 + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231121125418-e3f2a877f48c + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231121011021-97fab6cfe297 + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231122041324-c2b28b7aae5b + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231117154810-8bbeeadaa790 + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231121135848-459d0d2d2473 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63 - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74 - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683 - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231120163924-e1fb6fa23cc9 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231117083621-34d6c99b70a2 + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231121172507-4bfa55759e42 + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231121102312-2b0abad17780 + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231120141211-37c8c9192767 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231122125628-8718b512edcc github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231127161102-5558735b53ac @@ -57,7 +57,7 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 // indirect - github.com/gophercloud/gophercloud v1.7.0 // indirect + github.com/gophercloud/gophercloud v1.8.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -67,8 +67,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openshift/api v3.9.0+incompatible // indirect - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63 //indirect - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63 + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231204114424-a857120974fc //indirect + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231204114424-a857120974fc github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect @@ -113,3 +113,5 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430 // Bump golang.org/x/net to avoid Rapid Reset CVE replace golang.org/x/net => golang.org/x/net v0.18.0 //allow-merging + +replace github.com/openstack-k8s-operators/glance-operator/api => github.com/fmount/glance-operator/api v0.1.2-0.20231206223626-b0aa0f3a3f56 diff --git a/apis/go.sum b/apis/go.sum index 48e6d8103..93354ae7b 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -33,6 +33,8 @@ github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCv github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= +github.com/fmount/glance-operator/api v0.1.2-0.20231206223626-b0aa0f3a3f56 h1:BbezXeRMGr/KJ5RNgIBQZZA7X+MBaXSRWHJjNA3L3kM= +github.com/fmount/glance-operator/api v0.1.2-0.20231206223626-b0aa0f3a3f56/go.mod h1:iLnnFaUIxRCsmVs/emy4C6H/1HHh6dreMH4gvZ3jFuI= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -93,8 +95,8 @@ github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHa github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gophercloud/gophercloud v1.7.0 h1:fyJGKh0LBvIZKLvBWvQdIgkaV5yTM3Jh9EYUh+UNCAs= -github.com/gophercloud/gophercloud v1.7.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= +github.com/gophercloud/gophercloud v1.8.0 h1:TM3Jawprb2NrdOnvcHhWJalmKmAmOGgfZElM/3oBYCk= +github.com/gophercloud/gophercloud v1.8.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= @@ -132,38 +134,36 @@ github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxC github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231122193628-96ca1e05d8ad h1:qBfLa7kRWzTCitV32Zvi89knSNMQgd4bCSGlA4baLHI= github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231122193628-96ca1e05d8ad/go.mod h1:cW498Nb/C86IqMJSyP6QLmeo0MS7rEL7dUTm4iBZlxM= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231124170114-3771599a828e h1:Y2E9of7I7ml3KH5rJcv1RMRWsnLLEd9y9V1xupcBoYo= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231124170114-3771599a828e/go.mod h1:CZH9vWRBuZISU3PW/egdHo8avZvUOljTNcXEtmCJUC8= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231126175241-a71b6613629e h1:rfGJf0wDhCReGB7b1l3E0NyqggArKK0BSeS4iUsxjP8= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231126175241-a71b6613629e/go.mod h1:Wn+GO3Kddf7C5wM2vLNo2Ub1KRmy6qCuTwdyJlxXUuc= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231129103834-0b292f39b018 h1:6zswS7zSBaH9npgYcmEcWt6aS7Uvb3g0GWwnZw9BvEo= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231129103834-0b292f39b018/go.mod h1:BlT0ELQrPgshlLGOzQYMi4qgHhryq0oFrdS2W0/9uNw= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231126231141-b59990d87301 h1:vZ7IMvkZN1Wig+5UHXXAcfM8tgXDqaE3ED6lDQPMODM= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231126231141-b59990d87301/go.mod h1:nGekbY/XSfSyDkGTSrWj89khYU05j2ZTSzuNKZC98cQ= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231127063959-58a687bf0bb4 h1:XQ2SLbJoGpIjUsV1VT/ktFKFjsyey1QOwLrP0lGGoVo= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231127063959-58a687bf0bb4/go.mod h1:5xLLL0CGkH31A33VMMEwF/D7o2yZDJpShnNfheF6Ku8= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231122104142-3b449040167e h1:IO+2tiM3KD2Rll+gcdIwF8Eziya8iQMCKbaXqZmu0JY= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231122104142-3b449040167e/go.mod h1:FnKU6sravC43Uj0iq2bhZaPMjoPCBhkNlVdiVoGi5/E= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54 h1:feWz7K3XIqZOZenySzfei4rsCrdgpS30kInXokX06YA= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54/go.mod h1:H6BuZ52u+Dq/vWJgpGIJLttRTnPPH3xdVeqhI99QE/k= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231121084647-689b50f424d8 h1:zkKuC5JIiQB6AezfKBwUJfgNir/w9jSaeFT+naZgC6c= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231121084647-689b50f424d8/go.mod h1:wV6KRR6y+QCJf5R6nQ7dSRQenKEFWV6TIHWhh9wTbMc= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231121201004-def8670ef7e9 h1:mdaBbHhIqN5uUhL9z3gmNdRlCg3F3aDtvUZIXTcozQc= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231121201004-def8670ef7e9/go.mod h1:Omznf+d4Vgt1Iv1X/37QN8OiXUcdD35uLoo2CL7b+2Y= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231121011021-97fab6cfe297 h1:YsBGtqJm9jO7f7t2tvpnKd0tY9B5S3DIc7VxArrYemk= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231121011021-97fab6cfe297/go.mod h1:onZi7lv87FrDrL8GfNblZCntw+mZHfvhP8AyWoV8yTs= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231122041324-c2b28b7aae5b h1:NXyapgFXvM4pU6sK2TL+I1XKWrobb8cTgr3ya5Xaoy8= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231122041324-c2b28b7aae5b/go.mod h1:E6wTskjNW5s3SjqBXoStbhNoz2bixTBzsKY4dCR6Xek= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231117154810-8bbeeadaa790 h1:LSOZRm1HmwwSsBxJ4KRy0jLMvVOMhvLghygdtrq2tLo= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231117154810-8bbeeadaa790/go.mod h1:FnKU6sravC43Uj0iq2bhZaPMjoPCBhkNlVdiVoGi5/E= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231121135848-459d0d2d2473 h1:ezk86B83XdlrocSX5ULEc3r/tPK6zpCMsqaBv6RvNnc= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231121135848-459d0d2d2473/go.mod h1:H6BuZ52u+Dq/vWJgpGIJLttRTnPPH3xdVeqhI99QE/k= github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf h1:Omn04tJTZlNOXIszGurB8XfpbsGf+6LIn86BaN9XRDs= github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf/go.mod h1:kDtQ2LCkf28F7xgK8GBFAMPDhXnL6iRb8NztHhrYaO0= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63 h1:iA/8vt+o2bMxYvvenNB7VArBvM8UyDLw3G7S/teMLc0= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:OYad2L+OD4j5CR49di7gu3Q1UkLBmpYwvtdoGlnasL4= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63 h1:Bl+kXtdCux8H/iXixa+g/fdtPKCJc7oCyPsfZo70thE= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:IUYIDD1uazTWDPYTmAojTBFQDZ7lATPWTfynx2QlPjU= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63 h1:ok420+r0QGypb4ORk2Zi4k9i0pgXjMZHQ1w/6zgxyrE= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:c2O0jOl7eqVGIiOlMbw8GTypoAPQlvR4fFzYsiu2Cqc= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2 h1:1YomaRytO5WUtKw5u23vIhebMNZthvWalofb5L+O/3Q= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2/go.mod h1:FKv/mQ3v3WNoX+1ED5zBjsvmvZqWtFxcvtmC2t/Sel8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74 h1:3E5bqX9W6+RV2HurHpSf7jUNbY6S+uicl/4YHgbF8gg= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe h1:FRK72vKyVU1BSgwL1QKwBQdbHAvShTeQfnoDpgegfXk= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe/go.mod h1:nCjKcVpx3wdJBylGWeogNTYIvDypumVmVcWVwecz9gk= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683 h1:gNwWtloS3C6Be1mctQrxv/3sE7dC+DbYHHZjVsuYNb8= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683/go.mod h1:JdFpTzEOgaS4MEwvvLPv4t/dY75/l/Za5E0Fh51rxAE= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6 h1:DP3NroFOCs8SLIZWWObKmW7TUVnZOv+YlMJpmp9X9q0= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc h1:zI2B70A0Czwgd0zUu6zojwucXuLokGjbw0UxF36tNlc= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc/go.mod h1:9n2nMFDiV5hGZHKr81aTAOHUoAxvEKivHeWCXFRJEZ4= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231204114424-a857120974fc h1:/6JrCMdnw/P03vXMqrA7cfeTlXiFJDoZzKzmJI4/rgM= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231204114424-a857120974fc/go.mod h1:SfdtKhpn1MGom0ZEOsgY27QFu+7SdDhO/LiuDe5cDXk= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231204114424-a857120974fc h1:dl8qY0BrgwcjTSW3mkqwDz3grYPrQNmqCimgc9W4l1Q= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231204114424-a857120974fc/go.mod h1:cZDEOHUMdjWrYlxxF7a4iE30GYEVSGwJYc76FJk/znY= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231120163924-e1fb6fa23cc9 h1:ccg8RAd1gDoNckRGG0GVcyphwL9oDI7KY+pj6PMVJn8= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231120163924-e1fb6fa23cc9/go.mod h1:zgedx2e2r67qeQh+uz2FQG7LCxcotJNJKqEmClRpaYs= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231117083621-34d6c99b70a2 h1:02J+UwHQHNnHCTyZPah1H5y5zF7HUL5mL7rhnL9gjdE= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231117083621-34d6c99b70a2/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231121172507-4bfa55759e42 h1:Q/msIg68tqhY0dFzPXJhj3yjLEIvgwa0gF3/TkV/FN4= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231121172507-4bfa55759e42/go.mod h1:w1L7pX8PoZCkU2mM7UwMVe7GP27GmzLts8D/d6YWEVA= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231121102312-2b0abad17780 h1:7dsPYiDMlp+B0u998uX7Ynxn6IEUgVoMBeHoDF2zn18= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231121102312-2b0abad17780/go.mod h1:1a1gZH+ZbCOsB9Yw4XdEEMjwXgd4SZT2wNa7FvQ7sQ4= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231120141211-37c8c9192767 h1:BEISFk8aQTa3N+RkJoCm1n9VsMBFjhZ2KmXptYGtQgY= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231120141211-37c8c9192767/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo= github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea h1:lPFVXVjenl8hhM4hjpIzGw7/wjYOZyopXc8dyCHOnCk= github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea/go.mod h1:PwjhScfklPbePYu7/kwym5sBzQRsTUJ1w/KPBQlbZFE= github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231122125628-8718b512edcc h1:8vvaPMOGF1V7XFZvfc28pgAcxTHXqKbu4dPKDyHib4I= diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index 34c0a28ae..0611458ad 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -648,6 +648,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -762,6 +766,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -825,6 +833,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -889,6 +901,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -945,25 +961,16 @@ spec: databaseUser: default: cinder type: string - dbPurge: - properties: - age: - default: 30 - minimum: 1 - type: integer - schedule: - default: 1 0 * * * - type: string - type: object debug: properties: - dbPurge: - default: false - type: boolean dbSync: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object extraMounts: items: properties: @@ -4506,137 +4513,142 @@ spec: - extraVol type: object type: array - glanceAPI: - properties: - containerImage: - type: string - customServiceConfig: - type: string - customServiceConfigSecrets: - items: - type: string - type: array - debug: - properties: - service: - default: false - type: boolean - type: object - networkAttachments: - items: + glanceAPIs: + additionalProperties: + properties: + containerImage: type: string - type: array - nodeSelector: - additionalProperties: + customServiceConfig: type: string - type: object - override: - properties: - service: - additionalProperties: - properties: - endpointURL: - type: string - metadata: - properties: - annotations: - additionalProperties: + customServiceConfigSecrets: + items: + type: string + type: array + debug: + properties: + service: + default: false + type: boolean + type: object + networkAttachments: + items: + type: string + type: array + nodeSelector: + additionalProperties: + type: string + type: object + override: + properties: + service: + additionalProperties: + properties: + endpointURL: + type: string + metadata: + properties: + annotations: + additionalProperties: + type: string + type: object + labels: + additionalProperties: + type: string + type: object + type: object + spec: + properties: + externalName: type: string - type: object - labels: - additionalProperties: + externalTrafficPolicy: type: string - type: object - type: object - spec: - properties: - externalName: - type: string - externalTrafficPolicy: - type: string - internalTrafficPolicy: - type: string - ipFamilyPolicy: - type: string - loadBalancerClass: - type: string - loadBalancerSourceRanges: - items: + internalTrafficPolicy: type: string - type: array - sessionAffinity: - type: string - sessionAffinityConfig: - properties: - clientIP: - properties: - timeoutSeconds: - format: int32 - type: integer - type: object - type: object - type: - type: string - type: object + ipFamilyPolicy: + type: string + loadBalancerClass: + type: string + loadBalancerSourceRanges: + items: + type: string + type: array + sessionAffinity: + type: string + sessionAffinityConfig: + properties: + clientIP: + properties: + timeoutSeconds: + format: int32 + type: integer + type: object + type: object + type: + type: string + type: object + type: object type: object - type: object - type: object - pvc: - type: string - replicas: - default: 1 - format: int32 - maximum: 32 - minimum: 0 - type: integer - resources: - properties: - claims: - items: - properties: - name: - type: string - required: + type: object + pvc: + type: string + replicas: + default: 1 + format: int32 + maximum: 32 + minimum: 0 + type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true type: object - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - type: object - storageClass: - type: string - storageRequest: - type: string - type: - default: split - enum: - - split - - single - type: string - required: - - containerImage - - storageRequest + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + storageClass: + type: string + storageRequest: + type: string + type: + default: split + enum: + - split + - single + - edge + type: string + required: + - containerImage + - storageRequest + type: object type: object imageCacheSize: default: "" type: string + keystoneEndpoint: + type: string nodeSelector: additionalProperties: type: string @@ -4688,8 +4700,9 @@ spec: required: - containerImage - databaseInstance - - glanceAPI + - glanceAPIs - imageCacheSize + - keystoneEndpoint - secret - storageRequest type: object @@ -6616,15 +6629,6 @@ spec: databaseUser: default: manila type: string - dbPurge: - properties: - age: - default: 30 - type: integer - schedule: - default: 1 0 * * * - type: string - type: object debug: properties: dbPurge: @@ -6634,6 +6638,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object extraMounts: items: properties: @@ -7407,6 +7415,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -7523,6 +7535,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string @@ -7589,6 +7605,10 @@ spec: default: false type: boolean type: object + defaultConfigOverwrite: + additionalProperties: + type: string + type: object networkAttachments: items: type: string diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml index a7dc95f53..fbad442a2 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane.yaml @@ -71,9 +71,10 @@ spec: databaseInstance: openstack storageClass: "" storageRequest: 10G - glanceAPI: - type: single - replicas: 1 + glanceAPIs: + default: + type: single + replicas: 1 cinder: template: databaseInstance: openstack diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml index 2244d3587..4a363f474 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml @@ -48,9 +48,10 @@ spec: databaseInstance: openstack storageClass: "" storageRequest: 10G - glanceAPI: - replicas: 1 - type: single + glanceAPIs: + default: + replicas: 1 + type: single cinder: template: databaseInstance: openstack diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index 9294d7187..19651fef1 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -64,9 +64,10 @@ spec: databaseInstance: openstack storageClass: "" storageRequest: 10G - glanceAPI: - type: single - replicas: 1 + glanceAPIs: + default: + type: single + replicas: 1 cinder: template: databaseInstance: openstack diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml index 68a315146..8c1807e68 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml @@ -64,9 +64,10 @@ spec: storageClass: "" storageRequest: 10G secret: osp-secret - glanceAPI: - replicas: 1 - type: single + glanceAPIs: + default: + replicas: 1 + type: single cinder: template: databaseInstance: openstack diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index a11575493..17977582d 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -63,21 +63,22 @@ spec: storageClass: "" storageRequest: 10G secret: osp-secret - glanceAPI: - type: single - replicas: 1 - override: - service: - internal: - metadata: - annotations: - metallb.universe.tf/address-pool: internalapi - metallb.universe.tf/allow-shared-ip: internalapi - metallb.universe.tf/loadBalancerIPs: 172.17.0.80 - spec: - type: LoadBalancer - networkAttachments: - - storage + glanceAPIs: + default: + type: single + replicas: 1 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer + networkAttachments: + - storage keystone: apiOverride: route: {} diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml index 463ebc835..dcba54e3b 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -85,21 +85,22 @@ spec: storageClass: "" storageRequest: 10G secret: osp-secret - glanceAPI: - type: single - replicas: 1 - override: - service: - internal: - metadata: - annotations: - metallb.universe.tf/address-pool: internalapi - metallb.universe.tf/allow-shared-ip: internalapi - metallb.universe.tf/loadBalancerIPs: 172.17.0.80 - spec: - type: LoadBalancer - networkAttachments: - - storage + glanceAPIs: + default: + type: single + replicas: 1 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer + networkAttachments: + - storage keystone: apiOverride: route: {} diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index 6e243ae25..e9507c98f 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -85,21 +85,22 @@ spec: storageClass: "" storageRequest: 10G secret: osp-secret - glanceAPI: - type: single - replicas: 1 - override: - service: - internal: - metadata: - annotations: - metallb.universe.tf/address-pool: internalapi - metallb.universe.tf/allow-shared-ip: internalapi - metallb.universe.tf/loadBalancerIPs: 172.17.0.80 - spec: - type: LoadBalancer - networkAttachments: - - storage + glanceAPIs: + default: + type: single + replicas: 1 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer + networkAttachments: + - storage keystone: apiOverride: route: {} diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index e22445f55..5df02fb96 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -124,20 +124,21 @@ spec: storageClass: "" storageRequest: 10G secret: osp-secret - glanceAPI: - replicas: 1 - override: - service: - internal: - metadata: - annotations: - metallb.universe.tf/address-pool: internalapi - metallb.universe.tf/allow-shared-ip: internalapi - metallb.universe.tf/loadBalancerIPs: 172.17.0.80 - spec: - type: LoadBalancer - networkAttachments: - - storage + glanceAPIs: + default: + replicas: 1 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer + networkAttachments: + - storage keystone: apiOverride: route: {} diff --git a/go.mod b/go.mod index 9972735db..c6e11b58a 100644 --- a/go.mod +++ b/go.mod @@ -10,25 +10,25 @@ require ( github.com/onsi/ginkgo/v2 v2.13.2 github.com/onsi/gomega v1.30.0 github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231122193628-96ca1e05d8ad - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231124170114-3771599a828e - github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231129111953-f33b7493ef6c - github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231126175241-a71b6613629e - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231129103834-0b292f39b018 - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231126231141-b59990d87301 - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231127063959-58a687bf0bb4 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231122104142-3b449040167e - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54 + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231121084647-689b50f424d8 + github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231120221946-75def08c43f0 + github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231121201004-def8670ef7e9 + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231121125418-e3f2a877f48c + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231121011021-97fab6cfe297 + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231122041324-c2b28b7aae5b + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231117154810-8bbeeadaa790 + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231121135848-459d0d2d2473 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf - github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231128145648-956f4d361a63 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63 - github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231128145648-956f4d361a63 - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74 - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683 - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6 - github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231130121358-7c60e9c0a60b - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231128100725-67372c98ca78 + github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231121101653-551c0acef6ba + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc + github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231121101653-551c0acef6ba + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231120163924-e1fb6fa23cc9 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231117083621-34d6c99b70a2 + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231121172507-4bfa55759e42 + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231121102312-2b0abad17780 + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231120141211-37c8c9192767 + github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231121180632-6dd9b38287ea + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231121111233-794666ba843e github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20230725141229-4ce90d0120fd github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231122125628-8718b512edcc @@ -74,7 +74,7 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 - github.com/gophercloud/gophercloud v1.7.0 // indirect + github.com/gophercloud/gophercloud v1.8.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -83,8 +83,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openshift/api v3.9.0+incompatible - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63 //indirect - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63 //indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231204114424-a857120974fc //indirect + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231204114424-a857120974fc //indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect @@ -131,3 +131,5 @@ replace github.com/openstack-k8s-operators/openstack-operator/apis => ./apis // mschuppert: map to latest commit from release-4.13 tag // must consistent within modules and service operators replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging + +replace github.com/openstack-k8s-operators/glance-operator/api => github.com/fmount/glance-operator/api v0.1.2-0.20231206223626-b0aa0f3a3f56 diff --git a/go.sum b/go.sum index 0f19faf44..b39091e62 100644 --- a/go.sum +++ b/go.sum @@ -37,6 +37,8 @@ github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCv github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= +github.com/fmount/glance-operator/api v0.1.2-0.20231206223626-b0aa0f3a3f56 h1:BbezXeRMGr/KJ5RNgIBQZZA7X+MBaXSRWHJjNA3L3kM= +github.com/fmount/glance-operator/api v0.1.2-0.20231206223626-b0aa0f3a3f56/go.mod h1:iLnnFaUIxRCsmVs/emy4C6H/1HHh6dreMH4gvZ3jFuI= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= @@ -98,8 +100,8 @@ github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHa github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gophercloud/gophercloud v1.7.0 h1:fyJGKh0LBvIZKLvBWvQdIgkaV5yTM3Jh9EYUh+UNCAs= -github.com/gophercloud/gophercloud v1.7.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= +github.com/gophercloud/gophercloud v1.8.0 h1:TM3Jawprb2NrdOnvcHhWJalmKmAmOGgfZElM/3oBYCk= +github.com/gophercloud/gophercloud v1.8.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= @@ -143,48 +145,46 @@ github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxC github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231122193628-96ca1e05d8ad h1:qBfLa7kRWzTCitV32Zvi89knSNMQgd4bCSGlA4baLHI= github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20231122193628-96ca1e05d8ad/go.mod h1:cW498Nb/C86IqMJSyP6QLmeo0MS7rEL7dUTm4iBZlxM= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231124170114-3771599a828e h1:Y2E9of7I7ml3KH5rJcv1RMRWsnLLEd9y9V1xupcBoYo= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231124170114-3771599a828e/go.mod h1:CZH9vWRBuZISU3PW/egdHo8avZvUOljTNcXEtmCJUC8= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231129111953-f33b7493ef6c h1:kGqNCY5sqSZcIGHcIg15YdjngS1xh8UQG+1GYCG7w6g= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231129111953-f33b7493ef6c/go.mod h1:ZdaLFRY3JshHD1ytg/5OloUzbbBGGFnvM3QFgyPDQBU= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231126175241-a71b6613629e h1:rfGJf0wDhCReGB7b1l3E0NyqggArKK0BSeS4iUsxjP8= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231126175241-a71b6613629e/go.mod h1:Wn+GO3Kddf7C5wM2vLNo2Ub1KRmy6qCuTwdyJlxXUuc= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231129103834-0b292f39b018 h1:6zswS7zSBaH9npgYcmEcWt6aS7Uvb3g0GWwnZw9BvEo= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231129103834-0b292f39b018/go.mod h1:BlT0ELQrPgshlLGOzQYMi4qgHhryq0oFrdS2W0/9uNw= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231126231141-b59990d87301 h1:vZ7IMvkZN1Wig+5UHXXAcfM8tgXDqaE3ED6lDQPMODM= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231126231141-b59990d87301/go.mod h1:nGekbY/XSfSyDkGTSrWj89khYU05j2ZTSzuNKZC98cQ= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231127063959-58a687bf0bb4 h1:XQ2SLbJoGpIjUsV1VT/ktFKFjsyey1QOwLrP0lGGoVo= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231127063959-58a687bf0bb4/go.mod h1:5xLLL0CGkH31A33VMMEwF/D7o2yZDJpShnNfheF6Ku8= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231122104142-3b449040167e h1:IO+2tiM3KD2Rll+gcdIwF8Eziya8iQMCKbaXqZmu0JY= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231122104142-3b449040167e/go.mod h1:FnKU6sravC43Uj0iq2bhZaPMjoPCBhkNlVdiVoGi5/E= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54 h1:feWz7K3XIqZOZenySzfei4rsCrdgpS30kInXokX06YA= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54/go.mod h1:H6BuZ52u+Dq/vWJgpGIJLttRTnPPH3xdVeqhI99QE/k= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231121084647-689b50f424d8 h1:zkKuC5JIiQB6AezfKBwUJfgNir/w9jSaeFT+naZgC6c= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231121084647-689b50f424d8/go.mod h1:wV6KRR6y+QCJf5R6nQ7dSRQenKEFWV6TIHWhh9wTbMc= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231120221946-75def08c43f0 h1:Yo/V/PPc11rgHgNojI2OgIp3bLECB3/KBnlfbYwsfGw= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231120221946-75def08c43f0/go.mod h1:1dZrgUfVa6uoR9MO8X0FOdk67porLAkQUSxHrJLtg10= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231121201004-def8670ef7e9 h1:mdaBbHhIqN5uUhL9z3gmNdRlCg3F3aDtvUZIXTcozQc= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231121201004-def8670ef7e9/go.mod h1:Omznf+d4Vgt1Iv1X/37QN8OiXUcdD35uLoo2CL7b+2Y= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231121011021-97fab6cfe297 h1:YsBGtqJm9jO7f7t2tvpnKd0tY9B5S3DIc7VxArrYemk= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231121011021-97fab6cfe297/go.mod h1:onZi7lv87FrDrL8GfNblZCntw+mZHfvhP8AyWoV8yTs= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231122041324-c2b28b7aae5b h1:NXyapgFXvM4pU6sK2TL+I1XKWrobb8cTgr3ya5Xaoy8= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231122041324-c2b28b7aae5b/go.mod h1:E6wTskjNW5s3SjqBXoStbhNoz2bixTBzsKY4dCR6Xek= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231117154810-8bbeeadaa790 h1:LSOZRm1HmwwSsBxJ4KRy0jLMvVOMhvLghygdtrq2tLo= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231117154810-8bbeeadaa790/go.mod h1:FnKU6sravC43Uj0iq2bhZaPMjoPCBhkNlVdiVoGi5/E= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231121135848-459d0d2d2473 h1:ezk86B83XdlrocSX5ULEc3r/tPK6zpCMsqaBv6RvNnc= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231121135848-459d0d2d2473/go.mod h1:H6BuZ52u+Dq/vWJgpGIJLttRTnPPH3xdVeqhI99QE/k= github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf h1:Omn04tJTZlNOXIszGurB8XfpbsGf+6LIn86BaN9XRDs= github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf/go.mod h1:kDtQ2LCkf28F7xgK8GBFAMPDhXnL6iRb8NztHhrYaO0= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231128145648-956f4d361a63 h1:kVxfqAz0Il4mEGjU71k+NwS6773u7e9LzoVBAZJNFOM= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231128145648-956f4d361a63/go.mod h1:+eEAq2Bfodi9xvh3S1OkEo4lJeTVGmhU/N7t5Hhpd6s= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63 h1:iA/8vt+o2bMxYvvenNB7VArBvM8UyDLw3G7S/teMLc0= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:OYad2L+OD4j5CR49di7gu3Q1UkLBmpYwvtdoGlnasL4= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63 h1:Bl+kXtdCux8H/iXixa+g/fdtPKCJc7oCyPsfZo70thE= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:IUYIDD1uazTWDPYTmAojTBFQDZ7lATPWTfynx2QlPjU= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63 h1:ok420+r0QGypb4ORk2Zi4k9i0pgXjMZHQ1w/6zgxyrE= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:c2O0jOl7eqVGIiOlMbw8GTypoAPQlvR4fFzYsiu2Cqc= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231128145648-956f4d361a63 h1:1IZLgbgGWRG9q3bPqd7Z+84bpTuplKACGr1PNyoyg1A= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:1O/yVDzImN27VNpAhc+f3Dsnx036P4c5x1rrUPIgCvM= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2 h1:1YomaRytO5WUtKw5u23vIhebMNZthvWalofb5L+O/3Q= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2/go.mod h1:FKv/mQ3v3WNoX+1ED5zBjsvmvZqWtFxcvtmC2t/Sel8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74 h1:3E5bqX9W6+RV2HurHpSf7jUNbY6S+uicl/4YHgbF8gg= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe h1:FRK72vKyVU1BSgwL1QKwBQdbHAvShTeQfnoDpgegfXk= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe/go.mod h1:nCjKcVpx3wdJBylGWeogNTYIvDypumVmVcWVwecz9gk= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683 h1:gNwWtloS3C6Be1mctQrxv/3sE7dC+DbYHHZjVsuYNb8= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683/go.mod h1:JdFpTzEOgaS4MEwvvLPv4t/dY75/l/Za5E0Fh51rxAE= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6 h1:DP3NroFOCs8SLIZWWObKmW7TUVnZOv+YlMJpmp9X9q0= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231130121358-7c60e9c0a60b h1:FlPvdPxv7GI8VFCP37buLB48UYbSMMePqsFvDzFA3+A= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231130121358-7c60e9c0a60b/go.mod h1:06u1jZTwbiHlcZmiuH+VM8CqDDWw8294lWsmLQIyTLM= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231128100725-67372c98ca78 h1:FqTe2p2b1qGd+RLVBImRHGAWkkSDaKhgTaBTJbKXlDc= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231128100725-67372c98ca78/go.mod h1:JLCVgdpOAk/zcJPJ+od/d0qOb41vkKsi9kzfjSQ6BAU= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231121101653-551c0acef6ba h1:G/RpYqRre5rvZIYd723bYgR2ana4oixfHuk70HkJWBM= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231121101653-551c0acef6ba/go.mod h1:2LOwHHrDb+DHecCTk0oLiLuD64RIfZzDD6LnaBpki/o= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc h1:zI2B70A0Czwgd0zUu6zojwucXuLokGjbw0UxF36tNlc= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc/go.mod h1:9n2nMFDiV5hGZHKr81aTAOHUoAxvEKivHeWCXFRJEZ4= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231204114424-a857120974fc h1:/6JrCMdnw/P03vXMqrA7cfeTlXiFJDoZzKzmJI4/rgM= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231204114424-a857120974fc/go.mod h1:SfdtKhpn1MGom0ZEOsgY27QFu+7SdDhO/LiuDe5cDXk= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231204114424-a857120974fc h1:dl8qY0BrgwcjTSW3mkqwDz3grYPrQNmqCimgc9W4l1Q= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231204114424-a857120974fc/go.mod h1:cZDEOHUMdjWrYlxxF7a4iE30GYEVSGwJYc76FJk/znY= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231121101653-551c0acef6ba h1:j729L4thjk84NGLYIMBT3xVFzjd6/I7iR3jpJi5yem4= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231121101653-551c0acef6ba/go.mod h1:xKsHwzBHiAeEGs0mwxnxs1PRZOYU48bTQ1WFNxICIOI= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231120163924-e1fb6fa23cc9 h1:ccg8RAd1gDoNckRGG0GVcyphwL9oDI7KY+pj6PMVJn8= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231120163924-e1fb6fa23cc9/go.mod h1:zgedx2e2r67qeQh+uz2FQG7LCxcotJNJKqEmClRpaYs= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231117083621-34d6c99b70a2 h1:02J+UwHQHNnHCTyZPah1H5y5zF7HUL5mL7rhnL9gjdE= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231117083621-34d6c99b70a2/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231121172507-4bfa55759e42 h1:Q/msIg68tqhY0dFzPXJhj3yjLEIvgwa0gF3/TkV/FN4= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231121172507-4bfa55759e42/go.mod h1:w1L7pX8PoZCkU2mM7UwMVe7GP27GmzLts8D/d6YWEVA= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231121102312-2b0abad17780 h1:7dsPYiDMlp+B0u998uX7Ynxn6IEUgVoMBeHoDF2zn18= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231121102312-2b0abad17780/go.mod h1:1a1gZH+ZbCOsB9Yw4XdEEMjwXgd4SZT2wNa7FvQ7sQ4= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231120141211-37c8c9192767 h1:BEISFk8aQTa3N+RkJoCm1n9VsMBFjhZ2KmXptYGtQgY= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231120141211-37c8c9192767/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231121180632-6dd9b38287ea h1:q9jJy/oxaNyO9BV08LtG9dZZfft9QQQlD+lvm4mwkIA= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231121180632-6dd9b38287ea/go.mod h1:F7FGqCnXuQz8cJQKwAarxHTtNfk2ttLVEwKR+yx+7AE= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231121111233-794666ba843e h1:lJATykDuzLhJa6nAUKcxPeEnZc09zgY5DFnC1GkVMOo= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231121111233-794666ba843e/go.mod h1:JLCVgdpOAk/zcJPJ+od/d0qOb41vkKsi9kzfjSQ6BAU= github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea h1:lPFVXVjenl8hhM4hjpIzGw7/wjYOZyopXc8dyCHOnCk= github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea/go.mod h1:PwjhScfklPbePYu7/kwym5sBzQRsTUJ1w/KPBQlbZFE= github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231122125628-8718b512edcc h1:8vvaPMOGF1V7XFZvfc28pgAcxTHXqKbu4dPKDyHib4I= diff --git a/pkg/openstack/glance.go b/pkg/openstack/glance.go index c4b18f720..7c1c75090 100644 --- a/pkg/openstack/glance.go +++ b/pkg/openstack/glance.go @@ -42,13 +42,13 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl // add selector to service overrides for _, endpointType := range []service.Endpoint{service.EndpointPublic, service.EndpointInternal} { - if instance.Spec.Glance.Template.GlanceAPI.Override.Service == nil { - instance.Spec.Glance.Template.GlanceAPI.Override.Service = map[service.Endpoint]service.RoutedOverrideSpec{} + for _, glanceAPI := range instance.Spec.Glance.Template.GlanceAPIs { + if glanceAPI.Override.Service == nil { + glanceAPI.Override.Service = map[service.Endpoint]service.RoutedOverrideSpec{} + } + glanceAPI.Override.Service[endpointType] = AddServiceComponentLabel( + glanceAPI.Override.Service[endpointType], glance.Name) } - instance.Spec.Glance.Template.GlanceAPI.Override.Service[endpointType] = - AddServiceComponentLabel( - instance.Spec.Manila.Template.ManilaAPI.Override.Service[endpointType], - glance.Name) } // When component services got created check if there is the need to create a route @@ -70,20 +70,23 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl } var ctrlResult reconcile.Result - instance.Spec.Glance.Template.GlanceAPI.Override.Service, ctrlResult, err = EnsureEndpointConfig( - ctx, - instance, - helper, - glance, - svcs, - instance.Spec.Glance.Template.GlanceAPI.Override.Service, - instance.Spec.Glance.APIOverride, - corev1beta1.OpenStackControlPlaneExposeGlanceReadyCondition, - ) - if err != nil { - return ctrlResult, err - } else if (ctrlResult != ctrl.Result{}) { - return ctrlResult, nil + for name, glanceAPI := range instance.Spec.Glance.Template.GlanceAPIs { + glanceAPI.Override.Service, ctrlResult, err = EnsureEndpointConfig( + ctx, + instance, + helper, + glance, + svcs, + instance.Spec.Glance.Template.GlanceAPIs[name].Override.Service, + instance.Spec.Glance.APIOverride, + corev1beta1.OpenStackControlPlaneExposeGlanceReadyCondition, + ) + if err != nil { + return ctrlResult, err + } + if (ctrlResult != ctrl.Result{}) { + return ctrlResult, nil + } } }