Skip to content

Bump manila and fix functional tests #1450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
May 22, 2025
Merged

Bump manila and fix functional tests #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae032e1
bump manila-operator reference
stuggi May 22, 2025
38173d7
Fix functional tests
stuggi May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250506083817-ce591b464a0f
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250508141203-be026d3164f7
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250521081014-a2653e8d7108
Expand Down
4 changes: 2 additions & 2 deletions apis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.2025042
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250423055245-3cb2ae8df6f0/go.mod h1:fesgTbs2j30Fhw2hebXkPgbeAIqG0Yk2oaeOklAInZg=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7 h1:N7HNoUrjqrWZWWcQdtaZubrQ1pFeWai1Cbls0RoCjK8=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7/go.mod h1:5+v92XC/PRATIiBrhNLEpJ+T4R9JpxBCgRP6QvbfwgE=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b h1:uNdpmQF3mORCgZ4D78Dy0FjT8p0YGfsjTW0nPtYNMnU=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b/go.mod h1:hoGpPnwLpUBj+xYJIVkXMsk5CKs3rMO3XDkc/z9MplI=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26 h1:E+zURvPLHDt3rki09xk/r2FxDOBUTy5QkvWFeYilMks=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26/go.mod h1:C4SR6/BAW7Pd6bom7simjV9j1/Eky2/EXc0OtyBd1Ms=
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a h1:IHGE1rUzvonx1Vsfk4QgetGfOr6z0CB5idbu3NBUUSA=
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a/go.mod h1:ZgHSxZSgpgHg1FhKPnBm/cqxAJbVFbKiBkqQoRohn3Q=
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6 h1:POLDrWP4IZG6a0VM8gdOp47vwbU/SSB9XWO3ajOJK2E=
Expand Down
2 changes: 1 addition & 1 deletion config/operator/manager_operator_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
value: quay.io/openstack-k8s-operators/keystone-operator@sha256:94a4240090b2375f598d1d82873deaf8b5fa54c458b891b1fc31298b30462b25
- name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
value: quay.io/openstack-k8s-operators/manila-operator@sha256:5bfab8a4754ff8dc7ca40272604e8fc0f5717d255b8fe8fd4917da76f6fd3667
value: quay.io/openstack-k8s-operators/manila-operator@sha256:9b87253edc60e8e06743c59d2dbf3fbf104eaa2c259cc1d99e638045c7740b21
- name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL
value: quay.io/openstack-k8s-operators/mariadb-operator@sha256:9a2a5c1d7d96396bf6e9255fb61f74f8156561b8edf70fb22364455ef86c98cb
- name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250508141203-be026d3164f7
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250508141203-be026d3164f7
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250521081014-a2653e8d7108
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.202505081
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7/go.mod h1:5+v92XC/PRATIiBrhNLEpJ+T4R9JpxBCgRP6QvbfwgE=
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250508141203-be026d3164f7 h1:SiJ+T5OK5y4dkPFvHZZeLpSHjDFULaaGKZ2dFdE8uRg=
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250508141203-be026d3164f7/go.mod h1:oKvVb28i6wwBR5uQO2B2KMzZnCFTPCUCj31c5Zvz2lo=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b h1:uNdpmQF3mORCgZ4D78Dy0FjT8p0YGfsjTW0nPtYNMnU=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b/go.mod h1:hoGpPnwLpUBj+xYJIVkXMsk5CKs3rMO3XDkc/z9MplI=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26 h1:E+zURvPLHDt3rki09xk/r2FxDOBUTy5QkvWFeYilMks=
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26/go.mod h1:C4SR6/BAW7Pd6bom7simjV9j1/Eky2/EXc0OtyBd1Ms=
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a h1:IHGE1rUzvonx1Vsfk4QgetGfOr6z0CB5idbu3NBUUSA=
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a/go.mod h1:ZgHSxZSgpgHg1FhKPnBm/cqxAJbVFbKiBkqQoRohn3Q=
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6 h1:POLDrWP4IZG6a0VM8gdOp47vwbU/SSB9XWO3ajOJK2E=
Expand Down
2 changes: 1 addition & 1 deletion hack/export_operator_related_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:1a0c89425443aa10c4451745edcb77029e9af7df4d8adcc765865ac0be1fa2c2
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:5452a2a8b3495577f5fbf0723896ace03945d1ebcef50bdbe7e2d6ac8132a6ac
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:94a4240090b2375f598d1d82873deaf8b5fa54c458b891b1fc31298b30462b25
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:5bfab8a4754ff8dc7ca40272604e8fc0f5717d255b8fe8fd4917da76f6fd3667
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:9b87253edc60e8e06743c59d2dbf3fbf104eaa2c259cc1d99e638045c7740b21
export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:9a2a5c1d7d96396bf6e9255fb61f74f8156561b8edf70fb22364455ef86c98cb
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:6630770bc41c606f14f7a92106a494aa91d9046e768e15f723ee8344603ca180
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:47b2270bae35abca948f6d633e1dc516a82f10f318af3af1262d8d5ee748e2b0
Expand Down
25 changes: 20 additions & 5 deletions tests/functional/ctlplane/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
"databaseInstance": "openstack",
"secret": "osp-secret",
"passwordSelectors": map[string]interface{}{
"AuthEncryptionKey": "HeatAuthEncryptionKey",
"authEncryptionKey": "HeatAuthEncryptionKey",
},
}
telemetryTemplate := map[string]interface{}{
Expand All @@ -521,6 +521,22 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
"enabled": false,
},
}
manilaTemplate := map[string]interface{}{
"rabbitMqClusterName": "rabbitmq",
"memcachedInstance": "memcached",
"databaseAccount": "account",
"manilaAPI": map[string]interface{}{
"replicas": 1,
},
"manilaScheduler": map[string]interface{}{
"replicas": 1,
},
"manilaShares": map[string]interface{}{
"share1": map[string]interface{}{
"replicas": 1,
},
},
}

return map[string]interface{}{
"secret": "osp-secret",
Expand Down Expand Up @@ -578,11 +594,10 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
"barbican": map[string]interface{}{
"enabled": false,
},
"openstackclient": map[string]interface{}{
"enabled": true,
},
"openstackclient": map[string]interface{}{},
"manila": map[string]interface{}{
"enabled": true,
"enabled": true,
"template": manilaTemplate,
},
"heat": map[string]interface{}{
"enabled": true,
Expand Down
16 changes: 0 additions & 16 deletions tests/functional/ctlplane/openstackoperator_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,22 +1459,6 @@ var _ = Describe("OpenStackOperator controller", func() {
BeforeEach(func() {
spec := GetDefaultOpenStackControlPlaneSpec()
spec["tls"] = GetTLSPublicSpec()
spec["manila"] = map[string]interface{}{
"enabled": true,
"template": map[string]interface{}{
"manilaAPI": map[string]interface{}{
"replicas": 1,
},
"manilaScheduler": map[string]interface{}{
"replicas": 1,
},
"manilaShares": map[string]interface{}{
"share1": map[string]interface{}{
"replicas": 1,
},
},
},
}
DeferCleanup(
th.DeleteInstance,
CreateOpenStackControlPlane(names.OpenStackControlplaneName, spec),
Expand Down