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 an arbitrary number of
glanceAPI(s).
The logic has been improved to support the new CRD and the Glance
reconcile logic has been revisited as well.

Signed-off-by: Francesco Pantano <[email protected]>
  • Loading branch information
@fmount
fmount committed Dec 9, 2023
1 parent b7c515f commit 0a5b349
Show file tree
Hide file tree
Showing 23 changed files with 623 additions and 553 deletions.
427 changes: 218 additions & 209 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apis/core/v1beta1/openstackcontrolplane_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ type GlanceSection struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// APIOverride, provides the ability to override the generated manifest of several child resources.
APIOverride Override `json:"apiOverride,omitempty"`
APIOverride map[string]Override `json:"apiOverrides,omitempty"`
}

// CinderSection defines the desired state of Cinder service
Expand Down
8 changes: 7 additions & 1 deletion apis/core/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
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.20231206173636-5eb2ad7769a7
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.20231207110546-628604e7579b
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231208104910-f8433c1c9399
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231208084806-7d16c97927fe
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231205160200-1f061113c717
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231205003453-c971bdd03386
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231206091318-5f09d2fd3c1b
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.20231207110546-628604e7579b //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231207110546-628604e7579b
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231208084806-7d16c97927fe //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231208084806-7d16c97927fe
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 Expand Up @@ -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.20231209200728-562e74a308d5
20 changes: 10 additions & 10 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.20231209200728-562e74a308d5 h1:LGzTac1yKI3gF0mxVCeWHu4ZThyMP9O1KXJNlbwsaj0=
github.com/fmount/glance-operator/api v0.1.2-0.20231209200728-562e74a308d5/go.mod h1:3mSRS6E0MojTjGjavytRUa+IH2qPujvdrImEFu5sxFM=
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=
Expand Down Expand Up @@ -136,8 +138,6 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231201071704-3
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231201071704-3a2ff9dc56b5/go.mod h1:mNVvmXLe21A6Ap9qqCcvtuYefLRm7E5cA4YalHV89oI=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231205132751-b5000faad819 h1:QyKf2ifup+JTMth0lbufMjR3daAMKP71PeODqzWMG6g=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231205132751-b5000faad819/go.mod h1:Wn+GO3Kddf7C5wM2vLNo2Ub1KRmy6qCuTwdyJlxXUuc=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231205140622-00b25ab16e6f h1:rje+Sf0hNSOTQtQrehUs227tz7zfNs5T1k8eneDnKRc=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231205140622-00b25ab16e6f/go.mod h1:iLnnFaUIxRCsmVs/emy4C6H/1HHh6dreMH4gvZ3jFuI=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231207082400-31f934b84cfc h1:lTHRGYXf3uqjdWVcBoDFU//W9w6IPyqQ2wuin08N6GI=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231207082400-31f934b84cfc/go.mod h1:+14IrrCmRMiY4RxqnAgRi5wzeC8TlPPbE/QvWYf5n7E=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231127063959-58a687bf0bb4 h1:XQ2SLbJoGpIjUsV1VT/ktFKFjsyey1QOwLrP0lGGoVo=
Expand All @@ -146,14 +146,14 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231206173636-5
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231206173636-5eb2ad7769a7/go.mod h1:aEtxvVQO2zI7+bSh5alZWgK98FT71gwitAkeb9WOWUs=
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.20231207110546-628604e7579b h1:xXWByZ9fpR5IR+RIUQrJ9hKyzABuiy6XGFQReQwkjxc=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231207110546-628604e7579b/go.mod h1:9n2nMFDiV5hGZHKr81aTAOHUoAxvEKivHeWCXFRJEZ4=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231207110546-628604e7579b h1:YXL6GK03FiyirGZt35/DSssHfn9t4DTD5ZHpAY2Q2/Q=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231207110546-628604e7579b/go.mod h1:SfdtKhpn1MGom0ZEOsgY27QFu+7SdDhO/LiuDe5cDXk=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231207110546-628604e7579b h1:YrSbxQnM1jFK4ADqN9sTAoogIQNNV62H8kJAxdMhizg=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231207110546-628604e7579b/go.mod h1:cZDEOHUMdjWrYlxxF7a4iE30GYEVSGwJYc76FJk/znY=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231208104910-f8433c1c9399 h1:Te7JSPGGUhkzjig/1CjlPmQgMpHT0+yHWoTxbVJGJ74=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231208104910-f8433c1c9399/go.mod h1:kDtQ2LCkf28F7xgK8GBFAMPDhXnL6iRb8NztHhrYaO0=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231208084806-7d16c97927fe h1:5Fk8+kZ8nVwBZv7QHH+NLlzsdgGS1Rn+bxx+90h8Zx8=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231208084806-7d16c97927fe/go.mod h1:9n2nMFDiV5hGZHKr81aTAOHUoAxvEKivHeWCXFRJEZ4=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231208084806-7d16c97927fe h1:3Ji78ik8bkstaoLOPMUv6X5728uvQIFArHQ3xGwpKps=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231208084806-7d16c97927fe/go.mod h1:SfdtKhpn1MGom0ZEOsgY27QFu+7SdDhO/LiuDe5cDXk=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231208084806-7d16c97927fe h1:0zoZaYBxzbsfVOwuur/WmgQMv+70eZnOriTXuxuKDmo=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231208084806-7d16c97927fe/go.mod h1:cZDEOHUMdjWrYlxxF7a4iE30GYEVSGwJYc76FJk/znY=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231205160200-1f061113c717 h1:sgVrbr7S2U3O2c+UpZtVZtRRv3tHfeweBr4g2f+ZOc4=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231205160200-1f061113c717/go.mod h1:zxkLJiNomToJs6K0dICg78vTvv/NQRW7EeblG1sg3rE=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231205003453-c971bdd03386 h1:d+rwNT9RK6zuGIV1OJbiyiDQxKnIktzEZiDvWhQGAf8=
Expand Down
Loading

0 comments on commit 0a5b349

Please sign in to comment.