From eb03c4a7745445f1ff252d3c16f9b42d15ef4c2e Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Fri, 13 Oct 2023 13:20:39 +0200 Subject: [PATCH] Add new glanceAPI struct This change is the first of a series where the purpose is to move away from the harcoded internal/external glanceAPI instance in favor of an arbitrary number of GlanceAPI instances. The current change doesn't introduce the ability to deploy >1 GlanceAPI instance, but introduces the logic that will serve this purpose. The split behavior is still preserved, but it happens behind the scenes in Glance. Signed-off-by: Francesco Pantano --- ....openstack.org_openstackcontrolplanes.yaml | 221 +++++------------- apis/go.mod | 44 ++-- apis/go.sum | 88 +++---- cmd/csv-merger/csv-merger.go | 2 +- ....openstack.org_openstackcontrolplanes.yaml | 221 +++++------------- .../core_v1beta1_openstackcontrolplane.yaml | 3 + ..._openstackcontrolplane_collapsed_cell.yaml | 3 + ..._v1beta1_openstackcontrolplane_galera.yaml | 3 + ...penstackcontrolplane_galera_3replicas.yaml | 3 + ...controlplane_galera_network_isolation.yaml | 22 +- ...ne_galera_network_isolation_3replicas.yaml | 22 +- ...enstackcontrolplane_network_isolation.yaml | 22 +- ...ckcontrolplane_network_isolation_ceph.yaml | 22 +- go.mod | 54 ++--- go.sum | 108 ++++----- hack/pin-bundle-images.sh | 3 + pkg/openstack/glance.go | 24 +- .../common/assert-sample-deployment.yaml | 3 + .../collapsed/01-assert-collapsed-cell.yaml | 2 + .../01-assert-galera-3replicas.yaml | 2 + .../tests/galera-basic/01-assert-galera.yaml | 2 + 21 files changed, 347 insertions(+), 527 deletions(-) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index be4fc346c..0932974ec 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -1311,6 +1311,9 @@ spec: - extraVol type: object type: array + memcachedInstance: + default: memcached + type: string nodeSelector: additionalProperties: type: string @@ -1342,6 +1345,7 @@ spec: - cinderAPI - cinderScheduler - databaseInstance + - memcachedInstance - rabbitMqClusterName - secret type: object @@ -4024,7 +4028,7 @@ spec: - extraVol type: object type: array - glanceAPIExternal: + glanceAPI: properties: containerImage: type: string @@ -4055,169 +4059,52 @@ spec: override: properties: service: - properties: - endpointURL: - type: string - metadata: - properties: - annotations: - additionalProperties: + 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 - 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: - - 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 - 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 - required: - - containerImage - type: object - glanceAPIInternal: - properties: - containerImage: - type: string - customServiceConfig: - type: string - customServiceConfigSecrets: - items: - type: string - type: array - debug: - properties: - service: - default: false - type: boolean - type: object - defaultConfigOverwrite: - additionalProperties: - type: string - type: object - networkAttachments: - items: - type: string - type: array - nodeSelector: - additionalProperties: - type: string - type: object - override: - properties: - service: - properties: - endpointURL: - type: string - metadata: - properties: - annotations: - additionalProperties: + ipFamilyPolicy: type: string - type: object - labels: - additionalProperties: + loadBalancerClass: 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: + loadBalancerSourceRanges: + items: + type: string + type: array + sessionAffinity: 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 + sessionAffinityConfig: + properties: + clientIP: + properties: + timeoutSeconds: + format: int32 + type: integer + type: object + type: object + type: + type: string + type: object + type: object type: object type: object pvc: @@ -4259,8 +4146,19 @@ spec: 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 type: object imageCacheSize: default: "" @@ -4316,8 +4214,7 @@ spec: required: - containerImage - databaseInstance - - glanceAPIExternal - - glanceAPIInternal + - glanceAPI - imageCacheSize - secret - storageRequest @@ -7274,6 +7171,9 @@ spec: - containerImage type: object type: object + memcachedInstance: + default: memcached + type: string nodeSelector: additionalProperties: type: string @@ -7304,6 +7204,7 @@ spec: required: - manilaAPI - manilaScheduler + - memcachedInstance - rabbitMqClusterName type: object type: object diff --git a/apis/go.mod b/apis/go.mod index 51567a6e0..979f65045 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -3,26 +3,26 @@ module github.com/openstack-k8s-operators/openstack-operator/apis go 1.19 require ( - github.com/onsi/ginkgo/v2 v2.13.0 - github.com/onsi/gomega v1.29.0 - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231020183900-9e910befd6b1 - github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231104225543-fdc41a9ca857 - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231029084849-1626f1b5fd75 - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231024034110-9dd57dde400d - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231030011854-d014e871e1c1 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231020142809-b6b6796c004f - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231026221435-33533d2716d9 - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231020144009-3e445cd965f8 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231102083359-58e12a1299b2 - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231025113820-f49225061a75 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231024153304-3bd4917dd1d5 - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231024012242-a8ddfbf9ad44 - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231027160956-be7c8bc55252 - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231024120852-0456c0ac7b33 - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231027163223-d167c0bc319e - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231027133710-2ab891796f11 - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231027131443-90f3912444f1 - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231026160130-4d8f151f7f30 + github.com/onsi/ginkgo/v2 v2.13.1 + github.com/onsi/gomega v1.30.0 + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a + github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986 + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231115090205-264277ef61bb + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641 + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231113161711-d0c2a36fe46d + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231103171435-bb14d998275c + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7 + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0 + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87 + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56 + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543 + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4 + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843 github.com/rabbitmq/cluster-operator/v2 v2.5.0 k8s.io/apimachinery v0.27.4 sigs.k8s.io/controller-runtime v0.15.1 @@ -66,8 +66,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.20231027113646-46f2fdbf77f1 //indirect - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231102083359-58e12a1299b2 + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2 //indirect + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7 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 diff --git a/apis/go.sum b/apis/go.sum index d3c3098da..8b13840e9 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -124,52 +124,52 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= +github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= 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/cinder-operator/api v0.3.1-0.20231020183900-9e910befd6b1 h1:Ord99cl5+efbXF37fMvfN2BTtIWWwgA+kh23M1hTGqs= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231020183900-9e910befd6b1/go.mod h1:8NFIyjXZeC+T2UBcmTDTfSatRdhi2eaZlaAuzcT2rNk= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231104225543-fdc41a9ca857 h1:Tl1DLMWGbgIWCP9LuyEC8fkgOr3cnTKwX2qia9hYy18= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231104225543-fdc41a9ca857/go.mod h1:9Tr34wnMIKRi83XpZt3JsNkjN2wHcqMTl7perSs+kaE= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231029084849-1626f1b5fd75 h1:Fs6wT/L88eaCBkRrqxcFVEyyUjDxGPuJTvW0r1rb2Z0= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231029084849-1626f1b5fd75/go.mod h1:Q+rECoDyozwQhmGY/XBH78bsWZPHoSYLJBAuPpPDstM= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231024034110-9dd57dde400d h1:TUyytjG3MT7mxGu9FGq+F+cbnbpyCqrUmSHxXCA8bBw= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231024034110-9dd57dde400d/go.mod h1:ncGl+d8igcmEldEceSD55QSplCT5hRUvgCMUy55BY5I= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231030011854-d014e871e1c1 h1:Xqoe9BVToQakhY8ZQpteQUEtD6kVDRlz8DAW609Nids= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231030011854-d014e871e1c1/go.mod h1:+7HwRx7+qkpESj2guudh3Th+xIBzBQNY/+aXufSekHE= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231020142809-b6b6796c004f h1:5ImuLSFR+SQ4S4ArGPy4I7SORzJmMfw3GFw2kh+KQLE= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231020142809-b6b6796c004f/go.mod h1:Zx2FewCh3EFd62QGE7WnZBiAg0Spkm+FNM04eSRby1Q= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231026221435-33533d2716d9 h1:GkJJuun4td7/fNw7mCqntBXKkfq9SYvK6+Hgb4UbWN8= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231026221435-33533d2716d9/go.mod h1:jvTIQq25VtL21YtigO639tstZjc+aDwgOXk8/k58KsY= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231020144009-3e445cd965f8 h1:PpTqb+ZQfKJ81M2ngBsVAXWrxdpTogeWTgNAOYHEsXk= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231020144009-3e445cd965f8/go.mod h1:sDYtAWryP7mF2v4XfmKdAoFquVAMts2J5PuYFV9VBQU= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231102083359-58e12a1299b2 h1:U4hwPDoo9k2wo6PldPyJbgfvo9Mdyuhum7vLWTHez1c= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231102083359-58e12a1299b2/go.mod h1:NvjAETczXby5m3IvylR3YaOiEBWkmWbHBx/UrnUVtfA= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231027113646-46f2fdbf77f1 h1:tcqkGudMGkhYtLbMq8O0BVggrqsSdcdw1hEzplAO2Xc= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231027113646-46f2fdbf77f1/go.mod h1:bGwj+Spj1d880n7PhlmaRhLXpzTaX61b+ET0pfhm5gU= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231102083359-58e12a1299b2 h1:4XQVtWvaw8DamAXzG6SCFOQF49z+BeacLJKS6I7q9GA= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231102083359-58e12a1299b2/go.mod h1:zoThLQNL2Sbp3KAj3OaBNm+gbkEeblQW8tKLFiU4xFs= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231025113820-f49225061a75 h1:Y7wTON0KdnZOwZV5PPMSWmqwchyG8LQX1qQiqPRtLnk= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231025113820-f49225061a75/go.mod h1:gGBlCiZwXl6fIK+Dg8isC26U5J0ARCWAaD0ZlLPW9/M= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231024153304-3bd4917dd1d5 h1:kDuJWEZIFvy0Kp9SMazZyijVNH6gfOy0HrYq9lU1lyw= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231024153304-3bd4917dd1d5/go.mod h1:xhiz5wFdKWwVM7BF/VYon4TT3NuUPXp/Pyn2hWcp0CE= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231024012242-a8ddfbf9ad44 h1:GSu1bGHD0EmmxtNGgWKpYwmHc0xlgYd5g83R693TvKA= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231024012242-a8ddfbf9ad44/go.mod h1:2hVmJ9ZJT3rqRAOqA9MFURhwNAd4JyYFPE28DZo/wd4= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231027160956-be7c8bc55252 h1:fCv+UmXX/4jXMWOJFSaWGQXBUzYJN6rtYHyNDeWE0Hg= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231027160956-be7c8bc55252/go.mod h1:99WdMgWmI+B/rur/Cw96j4w/3JOb3Ng6foO6PHdWdt4= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231024120852-0456c0ac7b33 h1:YtF4DUKV+n/01HYA/FvSxBSvpSM0DTGX6/PvdBVxsVo= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231024120852-0456c0ac7b33/go.mod h1:dz3GimbnEJBxz9wT2TV9sQxqOn0pohJYPmmEY2+Ivm4= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231027163223-d167c0bc319e h1:0srL9j934enyU5eHqEKyChV4dWpCATVLk/hfFkX0YfQ= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231027163223-d167c0bc319e/go.mod h1:cC5LgSsafqTSIG+F4lNFv6TWWpVVpOnsT+jzhUgb7KU= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231027133710-2ab891796f11 h1:cv/s0lFKIAv1RBPN62DVFyps2LnXsAmwIKHaHz2lhkA= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231027133710-2ab891796f11/go.mod h1:RdKDrAjvjheIvnBKIbuNqv5j8J3rnoNQULn2xyjWKdg= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231027131443-90f3912444f1 h1:v7R+yCgvmKz54lS9Tu/G3rOTJayOjtKOX9R8TdsJ6cw= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231027131443-90f3912444f1/go.mod h1:7jMNv6+kbyFBevriDSRGffJfNPKYRHxKeRYU14S2oI4= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231026160130-4d8f151f7f30 h1:BQMhVIP43ZR1oyz4XERXjKa4MQ9YuJJYm3I+lDE0O9M= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231026160130-4d8f151f7f30/go.mod h1:NW65IReKFzxhHG3VnYXkucBTO0Zo8yF8s/4rv7yNMcA= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a h1:zKkWfeu+7mzFeTNLgZ10t70jMLwky7jHc1PfWUpJC3Y= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a/go.mod h1:wV6KRR6y+QCJf5R6nQ7dSRQenKEFWV6TIHWhh9wTbMc= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986 h1:m4h3nNtLYab80h3ke5HbSNFW/TMw01F2LFICDD2v5uk= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986/go.mod h1:Omznf+d4Vgt1Iv1X/37QN8OiXUcdD35uLoo2CL7b+2Y= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231115090205-264277ef61bb h1:P6b3VbylGGPKYjnDUvU0fQOl0ySGgQd3fwL+QjwBrNE= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231115090205-264277ef61bb/go.mod h1:b+/Jzmzv0wbVOxmRe+RKILhqmiKzrwC74eZyeD57RTc= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641 h1:cUDgIWqHAz8iJva/s9U/PDJJiWrZcJxZuDbRRwgQLX4= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641/go.mod h1:onZi7lv87FrDrL8GfNblZCntw+mZHfvhP8AyWoV8yTs= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a h1:AUc7G9r/EGzYrfadt6Ys4UnX0aCHBFiYMbym9a1I6to= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a/go.mod h1:FazcE2EjjeFzNoS/YBlupOTZUzdvW4ynZfBFZydhK2s= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231113161711-d0c2a36fe46d h1:ckpspm3bQzKu694fCDWFf90hNmCLZqr3Mgi7sB3Svt0= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231113161711-d0c2a36fe46d/go.mod h1:IQQQEKjcNEW97jssKZ+8dnCAPGySB5vz1jmDybfR9PY= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231103171435-bb14d998275c h1:ZzzIEG7uPLMbD7p7/tVxGKAFQs4ccsnfHkff2IP3GMs= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231103171435-bb14d998275c/go.mod h1:izfu2HxbZEa8WxbnmB/MBsh3OUkTWS5aHIag+TusLNM= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d h1:DbniGmM4s9c4MkkJhoDVprJtcBiB3ixpDZOu6VtgPJY= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d/go.mod h1:vIDFS1mvMsJ0ICXm2f8Qh+BmQwH/qef+Gq6SIoh4uKM= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7 h1:UEgV9NNx0XbQlwiebhtS4qdt3mPsMs6c8DMyv+i5tBc= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:mxh1HCiMTZm4cAqUK5yPigbZ5JJs3gOVgDVwbTbFAYk= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2 h1:3b9GPyCUpbqogAv6j6k1WBQ1a3k7MINQyTaYik3VqNw= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2/go.mod h1:gT47JFLsW0STzgKSsdUMjT9qXEhz3VjoRZsZySWlhTM= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7 h1:TxNYv31HAoHqECk342i1WQNqd8clTKB4iIg2OhgkUvs= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:WbaCMjAao8+4/UJAVyzjr2uiI53E3VcDD73FC3D6DM8= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020 h1:+mey+zjv++lniCqIUMpWXIE4FEB1RsmFevt3OsSbOSs= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020/go.mod h1:lbIGM/p24WtV4m5QuOZz7vQQvBE0jQGMEG7FE+gb+Rs= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0 h1:hzwSmpdED7Ro0a0VibNrw734uoJE1feCfu1BtEMLems= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87 h1:KlhTSF+xemciabUbNVKr7aZq+96+C9MFYktPfJM9exo= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87/go.mod h1:0YnQSFwO0nyZQnEizRJOLQxWDZupUsUAXu8SAMilYg4= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef h1:dTRzgL4m6CKSsPndz21Se588UkXS0dBaXXxtU3Q/NaM= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef/go.mod h1:qtb8TCcdCZnL0SEg/JPpc/bsS576zsM/VSBfJxbrNFc= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56 h1:kGO4FrqJ/4yUQd3BJoPwkfPFoLMNLWiRqMqWtuh3tS8= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d h1:141KSQvg9HN6sH2Ny3zlTWHxIuskxqOZkGeUpv81oVE= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d/go.mod h1:PmO/AmeaRjmR7c5rtNt9aNl/fwZBShmhG/fLA4teWh8= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543 h1:CgMWu9K+gPGks064bjnE/y5C85mWswIBKOEFiFUYBzk= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543/go.mod h1:Qt8vSEE7s5mquzVpTNfmM5OwFtyZKxudWRkYwOyKeY0= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4 h1:U7agXSKns/8BDwASnYnixveikUl4U0VaE3ctCARWxSE= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4/go.mod h1:RcnbLfxey6n8T899uwwVX1i1Jz+U6hWQWuaAZnmTSws= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843 h1:vWG5fEHch0GSj8PxNVYqAAYUboEpqF/VaITxThbSvb8= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843/go.mod h1:LdcL64BDpL2by4QPJ5C7UKjorBV8WyneJk6dnQgMKdQ= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/cmd/csv-merger/csv-merger.go b/cmd/csv-merger/csv-merger.go index 6c11fb61b..10263cae5 100644 --- a/cmd/csv-merger/csv-merger.go +++ b/cmd/csv-merger/csv-merger.go @@ -94,7 +94,7 @@ var ( horizonCsv = flag.String("horizon-csv", "", "Horizon CSV filename") swiftCsv = flag.String("swift-csv", "", "Swift CSV filename") octaviaCsv = flag.String("octavia-csv", "", "Octavia CSV filename") - designateCsv = flag.String("designate-csv", "", "Designate CSV filename") + designateCsv = flag.String("designate-csv", "", "Designate CSV filename") csvOverrides = flag.String("csv-overrides", "", "CSV like string with punctual changes that will be recursively applied (if possible)") importEnvFiles = flag.String("import-env-files", "", "Comma separated list of file names to read default operator ENVs from. Used for inter-bundle ENV merging.") exportEnvFile = flag.String("export-env-file", "", "Name the external file to write operator ENVs to. Used for inter-bundle ENV merging.") diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index be4fc346c..0932974ec 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -1311,6 +1311,9 @@ spec: - extraVol type: object type: array + memcachedInstance: + default: memcached + type: string nodeSelector: additionalProperties: type: string @@ -1342,6 +1345,7 @@ spec: - cinderAPI - cinderScheduler - databaseInstance + - memcachedInstance - rabbitMqClusterName - secret type: object @@ -4024,7 +4028,7 @@ spec: - extraVol type: object type: array - glanceAPIExternal: + glanceAPI: properties: containerImage: type: string @@ -4055,169 +4059,52 @@ spec: override: properties: service: - properties: - endpointURL: - type: string - metadata: - properties: - annotations: - additionalProperties: + 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 - 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: - - 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 - 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 - required: - - containerImage - type: object - glanceAPIInternal: - properties: - containerImage: - type: string - customServiceConfig: - type: string - customServiceConfigSecrets: - items: - type: string - type: array - debug: - properties: - service: - default: false - type: boolean - type: object - defaultConfigOverwrite: - additionalProperties: - type: string - type: object - networkAttachments: - items: - type: string - type: array - nodeSelector: - additionalProperties: - type: string - type: object - override: - properties: - service: - properties: - endpointURL: - type: string - metadata: - properties: - annotations: - additionalProperties: + ipFamilyPolicy: type: string - type: object - labels: - additionalProperties: + loadBalancerClass: 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: + loadBalancerSourceRanges: + items: + type: string + type: array + sessionAffinity: 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 + sessionAffinityConfig: + properties: + clientIP: + properties: + timeoutSeconds: + format: int32 + type: integer + type: object + type: object + type: + type: string + type: object + type: object type: object type: object pvc: @@ -4259,8 +4146,19 @@ spec: 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 type: object imageCacheSize: default: "" @@ -4316,8 +4214,7 @@ spec: required: - containerImage - databaseInstance - - glanceAPIExternal - - glanceAPIInternal + - glanceAPI - imageCacheSize - secret - storageRequest @@ -7274,6 +7171,9 @@ spec: - containerImage type: object type: object + memcachedInstance: + default: memcached + type: string nodeSelector: additionalProperties: type: string @@ -7304,6 +7204,7 @@ spec: required: - manilaAPI - manilaScheduler + - memcachedInstance - rabbitMqClusterName type: object type: object diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml index ac888dc17..03cc6be20 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane.yaml @@ -57,9 +57,12 @@ spec: secret: osp-secret glance: template: + secret: osp-secret databaseInstance: openstack storageClass: "" storageRequest: 10G + glanceAPI: + 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 0562fd2f2..f80db1dcb 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml @@ -34,9 +34,12 @@ spec: secret: osp-secret glance: template: + secret: osp-secret databaseInstance: openstack storageClass: "" storageRequest: 10G + glanceAPI: + replicas: 1 cinder: template: databaseInstance: openstack diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index a4ac3d904..5696bfa9b 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -50,9 +50,12 @@ spec: secret: osp-secret glance: template: + secret: osp-secret databaseInstance: openstack storageClass: "" storageRequest: 10G + glanceAPI: + 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 1eb8ad98f..92360cc22 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml @@ -53,6 +53,9 @@ spec: databaseInstance: openstack storageClass: "" storageRequest: 10G + secret: osp-secret + glanceAPI: + replicas: 1 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 d03c8879b..45a1f6026 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -62,19 +62,19 @@ spec: databaseInstance: openstack storageClass: "" storageRequest: 10G - glanceAPIInternal: + secret: osp-secret + glanceAPI: + replicas: 1 override: service: - 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 - glanceAPIExternal: + 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: 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 deb3ce1e5..c81de40ef 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -62,19 +62,19 @@ spec: databaseInstance: openstack storageClass: "" storageRequest: 10G - glanceAPIInternal: + secret: osp-secret + glanceAPI: + replicas: 1 override: service: - 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 - glanceAPIExternal: + 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: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index 745a334ec..7557ffeef 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -62,19 +62,19 @@ spec: databaseInstance: openstack storageClass: "" storageRequest: 10G - glanceAPIInternal: + secret: osp-secret + glanceAPI: + replicas: 1 override: service: - 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 - glanceAPIExternal: + 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: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 04f2938ad..79fb7fce2 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -101,19 +101,19 @@ spec: rbd_store_user = openstack storageClass: "" storageRequest: 10G - glanceAPIInternal: + secret: osp-secret + glanceAPI: + replicas: 1 override: service: - 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 - glanceAPIExternal: + 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: diff --git a/go.mod b/go.mod index 3b2152c72..b372cffea 100644 --- a/go.mod +++ b/go.mod @@ -7,32 +7,32 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v1.3.0 github.com/imdario/mergo v0.3.16 - github.com/onsi/ginkgo/v2 v2.13.0 - github.com/onsi/gomega v1.29.0 - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231020183900-9e910befd6b1 - github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231029224549-c73b9e5eddac - github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231104225543-fdc41a9ca857 - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231029084849-1626f1b5fd75 - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231024034110-9dd57dde400d - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231030011854-d014e871e1c1 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231020142809-b6b6796c004f - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231026221435-33533d2716d9 - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231020144009-3e445cd965f8 - github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231109064837-a0ac89bc5a39 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231102083359-58e12a1299b2 - github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231027113646-46f2fdbf77f1 - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231025113820-f49225061a75 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231024153304-3bd4917dd1d5 - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231024012242-a8ddfbf9ad44 - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231027160956-be7c8bc55252 - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231024120852-0456c0ac7b33 - github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231023175719-eb5337817c2c - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231026104821-01bd4fad7f1e + github.com/onsi/ginkgo/v2 v2.13.1 + github.com/onsi/gomega v1.30.0 + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a + github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231115091305-8982d0fb88cb + github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986 + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231115090205-264277ef61bb + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641 + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231113161711-d0c2a36fe46d + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231103171435-bb14d998275c + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d + github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231114102008-65eb1b13d3a7 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7 + github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231114102008-65eb1b13d3a7 + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0 + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87 + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56 + github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231106183649-b3c6a943b5c1 + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231103155754-959001301bbe 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.20231027163223-d167c0bc319e - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231027133710-2ab891796f11 - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231027131443-90f3912444f1 - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231026160130-4d8f151f7f30 + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543 + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4 + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843 github.com/operator-framework/api v0.17.6 github.com/rabbitmq/cluster-operator/v2 v2.5.0 go.uber.org/zap v1.26.0 @@ -82,8 +82,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.20231027113646-46f2fdbf77f1 //indirect - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231102083359-58e12a1299b2 //indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2 //indirect + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7 //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 diff --git a/go.sum b/go.sum index 027f7cdd8..921e0b287 100644 --- a/go.sum +++ b/go.sum @@ -135,62 +135,62 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= +github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= 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/cinder-operator/api v0.3.1-0.20231020183900-9e910befd6b1 h1:Ord99cl5+efbXF37fMvfN2BTtIWWwgA+kh23M1hTGqs= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231020183900-9e910befd6b1/go.mod h1:8NFIyjXZeC+T2UBcmTDTfSatRdhi2eaZlaAuzcT2rNk= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231029224549-c73b9e5eddac h1:f18eUsKkLOb9lmdAKm7TljLNUzSalG5MuGPztyEQaDM= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231029224549-c73b9e5eddac/go.mod h1:xkU3lg5cK0do484Kzp0AVTsc6uXO0LLWICfWQVSd6ZM= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231104225543-fdc41a9ca857 h1:Tl1DLMWGbgIWCP9LuyEC8fkgOr3cnTKwX2qia9hYy18= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231104225543-fdc41a9ca857/go.mod h1:9Tr34wnMIKRi83XpZt3JsNkjN2wHcqMTl7perSs+kaE= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231029084849-1626f1b5fd75 h1:Fs6wT/L88eaCBkRrqxcFVEyyUjDxGPuJTvW0r1rb2Z0= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231029084849-1626f1b5fd75/go.mod h1:Q+rECoDyozwQhmGY/XBH78bsWZPHoSYLJBAuPpPDstM= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231024034110-9dd57dde400d h1:TUyytjG3MT7mxGu9FGq+F+cbnbpyCqrUmSHxXCA8bBw= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231024034110-9dd57dde400d/go.mod h1:ncGl+d8igcmEldEceSD55QSplCT5hRUvgCMUy55BY5I= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231030011854-d014e871e1c1 h1:Xqoe9BVToQakhY8ZQpteQUEtD6kVDRlz8DAW609Nids= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231030011854-d014e871e1c1/go.mod h1:+7HwRx7+qkpESj2guudh3Th+xIBzBQNY/+aXufSekHE= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231020142809-b6b6796c004f h1:5ImuLSFR+SQ4S4ArGPy4I7SORzJmMfw3GFw2kh+KQLE= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231020142809-b6b6796c004f/go.mod h1:Zx2FewCh3EFd62QGE7WnZBiAg0Spkm+FNM04eSRby1Q= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231026221435-33533d2716d9 h1:GkJJuun4td7/fNw7mCqntBXKkfq9SYvK6+Hgb4UbWN8= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231026221435-33533d2716d9/go.mod h1:jvTIQq25VtL21YtigO639tstZjc+aDwgOXk8/k58KsY= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231020144009-3e445cd965f8 h1:PpTqb+ZQfKJ81M2ngBsVAXWrxdpTogeWTgNAOYHEsXk= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231020144009-3e445cd965f8/go.mod h1:sDYtAWryP7mF2v4XfmKdAoFquVAMts2J5PuYFV9VBQU= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231109064837-a0ac89bc5a39 h1:f6F22jZ6HNBdlrTBDziaoWM1HqW2LOME3nq+07SuC+s= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231109064837-a0ac89bc5a39/go.mod h1:Gr8E0kTkczsoUJ1AIzj9Z5vhl6V21ZrNJXICMB527qI= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231102083359-58e12a1299b2 h1:U4hwPDoo9k2wo6PldPyJbgfvo9Mdyuhum7vLWTHez1c= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231102083359-58e12a1299b2/go.mod h1:NvjAETczXby5m3IvylR3YaOiEBWkmWbHBx/UrnUVtfA= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231027113646-46f2fdbf77f1 h1:tcqkGudMGkhYtLbMq8O0BVggrqsSdcdw1hEzplAO2Xc= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231027113646-46f2fdbf77f1/go.mod h1:bGwj+Spj1d880n7PhlmaRhLXpzTaX61b+ET0pfhm5gU= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231102083359-58e12a1299b2 h1:4XQVtWvaw8DamAXzG6SCFOQF49z+BeacLJKS6I7q9GA= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231102083359-58e12a1299b2/go.mod h1:zoThLQNL2Sbp3KAj3OaBNm+gbkEeblQW8tKLFiU4xFs= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231027113646-46f2fdbf77f1 h1:ouapCIZeSB5D+g596OVyD6YDZrgP/AcMhgQ62J5CXyY= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231027113646-46f2fdbf77f1/go.mod h1:St2fdpMneNUq5XTamRLSgI5iKPm096JFGSFit5FjJ/4= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231025113820-f49225061a75 h1:Y7wTON0KdnZOwZV5PPMSWmqwchyG8LQX1qQiqPRtLnk= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231025113820-f49225061a75/go.mod h1:gGBlCiZwXl6fIK+Dg8isC26U5J0ARCWAaD0ZlLPW9/M= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231024153304-3bd4917dd1d5 h1:kDuJWEZIFvy0Kp9SMazZyijVNH6gfOy0HrYq9lU1lyw= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231024153304-3bd4917dd1d5/go.mod h1:xhiz5wFdKWwVM7BF/VYon4TT3NuUPXp/Pyn2hWcp0CE= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231024012242-a8ddfbf9ad44 h1:GSu1bGHD0EmmxtNGgWKpYwmHc0xlgYd5g83R693TvKA= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231024012242-a8ddfbf9ad44/go.mod h1:2hVmJ9ZJT3rqRAOqA9MFURhwNAd4JyYFPE28DZo/wd4= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231027160956-be7c8bc55252 h1:fCv+UmXX/4jXMWOJFSaWGQXBUzYJN6rtYHyNDeWE0Hg= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231027160956-be7c8bc55252/go.mod h1:99WdMgWmI+B/rur/Cw96j4w/3JOb3Ng6foO6PHdWdt4= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231024120852-0456c0ac7b33 h1:YtF4DUKV+n/01HYA/FvSxBSvpSM0DTGX6/PvdBVxsVo= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231024120852-0456c0ac7b33/go.mod h1:dz3GimbnEJBxz9wT2TV9sQxqOn0pohJYPmmEY2+Ivm4= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231023175719-eb5337817c2c h1:mpMYmo+QGSFfyp8FD+CL99Wp+WWDocRWM07BBkVq70Y= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231023175719-eb5337817c2c/go.mod h1:MtfAowdF5CFu3PkfnIuuL4piCtdtV4Xrk+48Rmq2s2s= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231026104821-01bd4fad7f1e h1:86VuS2dqjZZf0vEDiH+pTOtMTakFUnEeeQCfYmQtbBk= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231026104821-01bd4fad7f1e/go.mod h1:UTK7po+fGYND9AwrTpQvEhWMYXmViwJaaWt0LzhleDE= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231027163223-d167c0bc319e h1:0srL9j934enyU5eHqEKyChV4dWpCATVLk/hfFkX0YfQ= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231027163223-d167c0bc319e/go.mod h1:cC5LgSsafqTSIG+F4lNFv6TWWpVVpOnsT+jzhUgb7KU= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231027133710-2ab891796f11 h1:cv/s0lFKIAv1RBPN62DVFyps2LnXsAmwIKHaHz2lhkA= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231027133710-2ab891796f11/go.mod h1:RdKDrAjvjheIvnBKIbuNqv5j8J3rnoNQULn2xyjWKdg= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231027131443-90f3912444f1 h1:v7R+yCgvmKz54lS9Tu/G3rOTJayOjtKOX9R8TdsJ6cw= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231027131443-90f3912444f1/go.mod h1:7jMNv6+kbyFBevriDSRGffJfNPKYRHxKeRYU14S2oI4= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231026160130-4d8f151f7f30 h1:BQMhVIP43ZR1oyz4XERXjKa4MQ9YuJJYm3I+lDE0O9M= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231026160130-4d8f151f7f30/go.mod h1:NW65IReKFzxhHG3VnYXkucBTO0Zo8yF8s/4rv7yNMcA= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a h1:zKkWfeu+7mzFeTNLgZ10t70jMLwky7jHc1PfWUpJC3Y= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a/go.mod h1:wV6KRR6y+QCJf5R6nQ7dSRQenKEFWV6TIHWhh9wTbMc= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231115091305-8982d0fb88cb h1:5KcGzN0FinLP25iDprqxm9qxXj7Lxo+x0auc75ke/b4= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231115091305-8982d0fb88cb/go.mod h1:tTNSVmJScHD9DDkjUEBeCR/JQnNfD3hfCQl4dgnRi48= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986 h1:m4h3nNtLYab80h3ke5HbSNFW/TMw01F2LFICDD2v5uk= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986/go.mod h1:Omznf+d4Vgt1Iv1X/37QN8OiXUcdD35uLoo2CL7b+2Y= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231115090205-264277ef61bb h1:P6b3VbylGGPKYjnDUvU0fQOl0ySGgQd3fwL+QjwBrNE= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231115090205-264277ef61bb/go.mod h1:b+/Jzmzv0wbVOxmRe+RKILhqmiKzrwC74eZyeD57RTc= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641 h1:cUDgIWqHAz8iJva/s9U/PDJJiWrZcJxZuDbRRwgQLX4= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641/go.mod h1:onZi7lv87FrDrL8GfNblZCntw+mZHfvhP8AyWoV8yTs= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a h1:AUc7G9r/EGzYrfadt6Ys4UnX0aCHBFiYMbym9a1I6to= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a/go.mod h1:FazcE2EjjeFzNoS/YBlupOTZUzdvW4ynZfBFZydhK2s= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231113161711-d0c2a36fe46d h1:ckpspm3bQzKu694fCDWFf90hNmCLZqr3Mgi7sB3Svt0= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231113161711-d0c2a36fe46d/go.mod h1:IQQQEKjcNEW97jssKZ+8dnCAPGySB5vz1jmDybfR9PY= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231103171435-bb14d998275c h1:ZzzIEG7uPLMbD7p7/tVxGKAFQs4ccsnfHkff2IP3GMs= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231103171435-bb14d998275c/go.mod h1:izfu2HxbZEa8WxbnmB/MBsh3OUkTWS5aHIag+TusLNM= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d h1:DbniGmM4s9c4MkkJhoDVprJtcBiB3ixpDZOu6VtgPJY= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d/go.mod h1:vIDFS1mvMsJ0ICXm2f8Qh+BmQwH/qef+Gq6SIoh4uKM= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231114102008-65eb1b13d3a7 h1:KN0TQF5b5dU4xi5bJJOCCf7hQblcL2z0CVK8m0pKJzg= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231114102008-65eb1b13d3a7/go.mod h1:NgF3GoqdfCLPxDEyN6Um/VJzVHQqoUyx6Kt68hNWbc8= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7 h1:UEgV9NNx0XbQlwiebhtS4qdt3mPsMs6c8DMyv+i5tBc= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:mxh1HCiMTZm4cAqUK5yPigbZ5JJs3gOVgDVwbTbFAYk= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2 h1:3b9GPyCUpbqogAv6j6k1WBQ1a3k7MINQyTaYik3VqNw= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2/go.mod h1:gT47JFLsW0STzgKSsdUMjT9qXEhz3VjoRZsZySWlhTM= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7 h1:TxNYv31HAoHqECk342i1WQNqd8clTKB4iIg2OhgkUvs= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:WbaCMjAao8+4/UJAVyzjr2uiI53E3VcDD73FC3D6DM8= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231114102008-65eb1b13d3a7 h1:3SwLRhLCvpALjXrHdCVmPubIppqnyAVXCYt7Csih/7k= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:BLlqDjREd6imc1zOkWXwShWJPRcV6XknpGjdplSqP/w= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020 h1:+mey+zjv++lniCqIUMpWXIE4FEB1RsmFevt3OsSbOSs= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020/go.mod h1:lbIGM/p24WtV4m5QuOZz7vQQvBE0jQGMEG7FE+gb+Rs= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0 h1:hzwSmpdED7Ro0a0VibNrw734uoJE1feCfu1BtEMLems= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87 h1:KlhTSF+xemciabUbNVKr7aZq+96+C9MFYktPfJM9exo= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87/go.mod h1:0YnQSFwO0nyZQnEizRJOLQxWDZupUsUAXu8SAMilYg4= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef h1:dTRzgL4m6CKSsPndz21Se588UkXS0dBaXXxtU3Q/NaM= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef/go.mod h1:qtb8TCcdCZnL0SEg/JPpc/bsS576zsM/VSBfJxbrNFc= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56 h1:kGO4FrqJ/4yUQd3BJoPwkfPFoLMNLWiRqMqWtuh3tS8= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231106183649-b3c6a943b5c1 h1:3pZaY7/1nkOuhnCApZOyPrfUr6oQMg/WZsLvqAAJaHM= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231106183649-b3c6a943b5c1/go.mod h1:MZpsG9QOG29iO2SQHX+TPNijfncqXh4X6Nh1hR32nIw= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231103155754-959001301bbe h1:l7+lFZ5AJGOAP1ASq9eCQUwlDgGk1MweUO43UhSq0ZM= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231103155754-959001301bbe/go.mod h1:JLCVgdpOAk/zcJPJ+od/d0qOb41vkKsi9kzfjSQ6BAU= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d h1:141KSQvg9HN6sH2Ny3zlTWHxIuskxqOZkGeUpv81oVE= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d/go.mod h1:PmO/AmeaRjmR7c5rtNt9aNl/fwZBShmhG/fLA4teWh8= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543 h1:CgMWu9K+gPGks064bjnE/y5C85mWswIBKOEFiFUYBzk= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543/go.mod h1:Qt8vSEE7s5mquzVpTNfmM5OwFtyZKxudWRkYwOyKeY0= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4 h1:U7agXSKns/8BDwASnYnixveikUl4U0VaE3ctCARWxSE= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4/go.mod h1:RcnbLfxey6n8T899uwwVX1i1Jz+U6hWQWuaAZnmTSws= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843 h1:vWG5fEHch0GSj8PxNVYqAAYUboEpqF/VaITxThbSvb8= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843/go.mod h1:LdcL64BDpL2by4QPJ5C7UKjorBV8WyneJk6dnQgMKdQ= github.com/operator-framework/api v0.17.6 h1:E6+vlvYUKafvoXYtCuHlDZrXX4vl8AT+r93OxNlzjpU= github.com/operator-framework/api v0.17.6/go.mod h1:l/cuwtPxkVUY7fzYgdust2m9tlmb8I4pOvbsUufRb24= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/hack/pin-bundle-images.sh b/hack/pin-bundle-images.sh index 1e64787ea..0b92a82a5 100755 --- a/hack/pin-bundle-images.sh +++ b/hack/pin-bundle-images.sh @@ -46,6 +46,9 @@ for MOD_PATH in $(go list -mod=readonly -m -json all | jq -r '. | select(.Path | REPO_CURL_URL="https://${CURL_REGISTRY}/api/v1/repository/${IMAGENAMESPACE}" fi else + # Current hack to point to a diff glance-operator-bundle built on top + # of https://github.com/openstack-k8s-operators/glance-operator/pull/329 + GITHUB_USER="fpantano" REPO_CURL_URL="https://${CURL_REGISTRY}/api/v1/repository/${GITHUB_USER}" REPO_URL="${CURL_REGISTRY}/${GITHUB_USER}" fi diff --git a/pkg/openstack/glance.go b/pkg/openstack/glance.go index ca6e4fada..960686f3c 100644 --- a/pkg/openstack/glance.go +++ b/pkg/openstack/glance.go @@ -17,7 +17,6 @@ import ( k8s_errors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" ) @@ -39,18 +38,15 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl return ctrl.Result{}, nil } - serviceOverrides := map[service.Endpoint]service.RoutedOverrideSpec{} - if instance.Spec.Glance.Template.GlanceAPIExternal.Override.Service != nil { - serviceOverrides[service.EndpointPublic] = *instance.Spec.Glance.Template.GlanceAPIExternal.Override.Service - } - if instance.Spec.Glance.Template.GlanceAPIInternal.Override.Service != nil { - serviceOverrides[service.EndpointInternal] = *instance.Spec.Glance.Template.GlanceAPIInternal.Override.Service - } - // add selector to service overrides for _, endpointType := range []service.Endpoint{service.EndpointPublic, service.EndpointInternal} { - svcOverride := serviceOverrides[endpointType] - serviceOverrides[endpointType] = AddServiceComponentLabel(svcOverride, glance.Name) + if instance.Spec.Glance.Template.GlanceAPI.Override.Service == nil { + instance.Spec.Glance.Template.GlanceAPI.Override.Service = map[service.Endpoint]service.RoutedOverrideSpec{} + } + 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 @@ -72,13 +68,13 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl } var ctrlResult reconcile.Result - serviceOverrides, ctrlResult, err = EnsureEndpointConfig( + instance.Spec.Glance.Template.GlanceAPI.Override.Service, ctrlResult, err = EnsureEndpointConfig( ctx, instance, helper, glance, svcs, - serviceOverrides, + instance.Spec.Glance.Template.GlanceAPI.Override.Service, instance.Spec.Glance.APIOverride, corev1beta1.OpenStackControlPlaneExposeGlanceReadyCondition, ) @@ -92,8 +88,6 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl helper.GetLogger().Info("Reconciling Glance", "Glance.Namespace", instance.Namespace, "Glance.Name", "glance") op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), glance, func() error { instance.Spec.Glance.Template.DeepCopyInto(&glance.Spec) - glance.Spec.GlanceAPIExternal.Override.Service = ptr.To(serviceOverrides[service.EndpointPublic]) - glance.Spec.GlanceAPIInternal.Override.Service = ptr.To(serviceOverrides[service.EndpointInternal]) if glance.Spec.Secret == "" { glance.Spec.Secret = instance.Spec.Secret diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml index cf5ca5c67..1bc6f0b4e 100644 --- a/tests/kuttl/common/assert-sample-deployment.yaml +++ b/tests/kuttl/common/assert-sample-deployment.yaml @@ -43,6 +43,9 @@ spec: template: databaseInstance: openstack storageRequest: 10G + secret: osp-secret + glanceAPI: + replicas: 1 cinder: template: databaseInstance: openstack diff --git a/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml b/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml index e1e22c63f..2746b0de4 100644 --- a/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml +++ b/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml @@ -28,6 +28,8 @@ spec: template: databaseInstance: openstack storageRequest: 10G + glanceAPI: + replicas: 1 cinder: template: databaseInstance: openstack diff --git a/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml b/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml index 1d0b51309..35efe9d7d 100644 --- a/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml +++ b/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml @@ -44,6 +44,8 @@ spec: template: databaseInstance: openstack storageRequest: 10G + glanceAPI: + replicas: 1 cinder: template: databaseInstance: openstack diff --git a/tests/kuttl/tests/galera-basic/01-assert-galera.yaml b/tests/kuttl/tests/galera-basic/01-assert-galera.yaml index 96650f9ab..57379a3bc 100644 --- a/tests/kuttl/tests/galera-basic/01-assert-galera.yaml +++ b/tests/kuttl/tests/galera-basic/01-assert-galera.yaml @@ -44,6 +44,8 @@ spec: template: databaseInstance: openstack storageRequest: 10G + glanceAPI: + replicas: 1 cinder: template: databaseInstance: openstack