Skip to content

Commit

Permalink
Add list of glanceAPI support
Browse files Browse the repository at this point in the history 
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 <[email protected]>
  • Loading branch information
@fmount
fmount committed Dec 5, 2023
1 parent d12d9aa commit 90ed9d9
Show file tree
Hide file tree
Showing 15 changed files with 543 additions and 486 deletions.
303 changes: 161 additions & 142 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/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/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.20231121110947-d38363cf0f05
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231122111552-6bd6025ade37
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
Expand Down Expand Up @@ -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.20231122111552-6bd6025ade37 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231122111552-6bd6025ade37
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
Expand Down
64 changes: 32 additions & 32 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,38 +132,38 @@ 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/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/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/glance-operator/api v0.3.1-0.20231121125418-e3f2a877f48c h1:zFDwtIjn8KJaQFyhHPOy6at352/llHG430CQOR5fhWc=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231121125418-e3f2a877f48c/go.mod h1:7J0xgoa/6tTtguhHmQA8MwKQZRfUppCKLblSHYiGmes=
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.20231121110947-d38363cf0f05 h1:E0YjYiU5wDDBnAFspjYf67psNy6oH71hdyXxpjNGxuI=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231121110947-d38363cf0f05/go.mod h1:DDlVPkQNAyjRdZtDRiE80E5k3LyCcZVYfqggXv7YN9I=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231122111552-6bd6025ade37 h1:ftwUwA41Y6R8U883Saz7aDg2lqUTh2ewm0qKwLuGLcU=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231122111552-6bd6025ade37/go.mod h1:/6//JWNEY68jOMoaoaSI0koL2jzpEKim3m60+jFCbqY=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231122111552-6bd6025ade37 h1:/Rs+uNaUOXTDIMKbgcaHs4haCw7rt3EIIInkuaVS23I=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231122111552-6bd6025ade37/go.mod h1:/fOiiykTKi10vw4LMvAKPjKzC4/tKwGBgbqmn5GKjYU=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231122111552-6bd6025ade37 h1:F/sQ5+TzB1dVf4VyeyLDtcyNQDHnIkqZPK9V+cr/f6s=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231122111552-6bd6025ade37/go.mod h1:PAcGzUsidkqZLBv7aVf7tJsq9pzxGUwFDvA5Zeaq0a4=
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=
Expand Down
Loading

0 comments on commit 90ed9d9

Please sign in to comment.