Skip to content

Commit fe46370

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openstack-k8s-operators#1450 from stuggi/bump_manila
Bump manila and fix functional tests
2 parents ff2eff3 + 38173d7 commit fe46370

File tree

8 files changed

+28
-29
lines changed

8 files changed

+28
-29
lines changed

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250506083817-ce591b464a0f
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250508141203-be026d3164f7
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7
21-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250521081014-a2653e8d7108

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.2025042
118118
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250423055245-3cb2ae8df6f0/go.mod h1:fesgTbs2j30Fhw2hebXkPgbeAIqG0Yk2oaeOklAInZg=
119119
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7 h1:N7HNoUrjqrWZWWcQdtaZubrQ1pFeWai1Cbls0RoCjK8=
120120
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7/go.mod h1:5+v92XC/PRATIiBrhNLEpJ+T4R9JpxBCgRP6QvbfwgE=
121-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b h1:uNdpmQF3mORCgZ4D78Dy0FjT8p0YGfsjTW0nPtYNMnU=
122-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b/go.mod h1:hoGpPnwLpUBj+xYJIVkXMsk5CKs3rMO3XDkc/z9MplI=
121+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26 h1:E+zURvPLHDt3rki09xk/r2FxDOBUTy5QkvWFeYilMks=
122+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26/go.mod h1:C4SR6/BAW7Pd6bom7simjV9j1/Eky2/EXc0OtyBd1Ms=
123123
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a h1:IHGE1rUzvonx1Vsfk4QgetGfOr6z0CB5idbu3NBUUSA=
124124
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a/go.mod h1:ZgHSxZSgpgHg1FhKPnBm/cqxAJbVFbKiBkqQoRohn3Q=
125125
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6 h1:POLDrWP4IZG6a0VM8gdOp47vwbU/SSB9XWO3ajOJK2E=

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
3333
value: quay.io/openstack-k8s-operators/keystone-operator@sha256:94a4240090b2375f598d1d82873deaf8b5fa54c458b891b1fc31298b30462b25
3434
- name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
35-
value: quay.io/openstack-k8s-operators/manila-operator@sha256:5bfab8a4754ff8dc7ca40272604e8fc0f5717d255b8fe8fd4917da76f6fd3667
35+
value: quay.io/openstack-k8s-operators/manila-operator@sha256:9b87253edc60e8e06743c59d2dbf3fbf104eaa2c259cc1d99e638045c7740b21
3636
- name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL
3737
value: quay.io/openstack-k8s-operators/mariadb-operator@sha256:9a2a5c1d7d96396bf6e9255fb61f74f8156561b8edf70fb22364455ef86c98cb
3838
- name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250508141203-be026d3164f7
2727
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7
2828
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250508141203-be026d3164f7
29-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b
29+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26
3030
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6
3232
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250521081014-a2653e8d7108

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.202505081
128128
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250508141203-be026d3164f7/go.mod h1:5+v92XC/PRATIiBrhNLEpJ+T4R9JpxBCgRP6QvbfwgE=
129129
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250508141203-be026d3164f7 h1:SiJ+T5OK5y4dkPFvHZZeLpSHjDFULaaGKZ2dFdE8uRg=
130130
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250508141203-be026d3164f7/go.mod h1:oKvVb28i6wwBR5uQO2B2KMzZnCFTPCUCj31c5Zvz2lo=
131-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b h1:uNdpmQF3mORCgZ4D78Dy0FjT8p0YGfsjTW0nPtYNMnU=
132-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250429110312-bdf0391aca8b/go.mod h1:hoGpPnwLpUBj+xYJIVkXMsk5CKs3rMO3XDkc/z9MplI=
131+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26 h1:E+zURvPLHDt3rki09xk/r2FxDOBUTy5QkvWFeYilMks=
132+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250515105130-02f6968eab26/go.mod h1:C4SR6/BAW7Pd6bom7simjV9j1/Eky2/EXc0OtyBd1Ms=
133133
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a h1:IHGE1rUzvonx1Vsfk4QgetGfOr6z0CB5idbu3NBUUSA=
134134
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a/go.mod h1:ZgHSxZSgpgHg1FhKPnBm/cqxAJbVFbKiBkqQoRohn3Q=
135135
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250508051221-25c4196e4eb6 h1:POLDrWP4IZG6a0VM8gdOp47vwbU/SSB9XWO3ajOJK2E=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op
99
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:1a0c89425443aa10c4451745edcb77029e9af7df4d8adcc765865ac0be1fa2c2
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:5452a2a8b3495577f5fbf0723896ace03945d1ebcef50bdbe7e2d6ac8132a6ac
1111
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:94a4240090b2375f598d1d82873deaf8b5fa54c458b891b1fc31298b30462b25
12-
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:5bfab8a4754ff8dc7ca40272604e8fc0f5717d255b8fe8fd4917da76f6fd3667
12+
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:9b87253edc60e8e06743c59d2dbf3fbf104eaa2c259cc1d99e638045c7740b21
1313
export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:9a2a5c1d7d96396bf6e9255fb61f74f8156561b8edf70fb22364455ef86c98cb
1414
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:6630770bc41c606f14f7a92106a494aa91d9046e768e15f723ee8344603ca180
1515
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:47b2270bae35abca948f6d633e1dc516a82f10f318af3af1262d8d5ee748e2b0

‎tests/functional/ctlplane/base_test.go‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
504504
"databaseInstance": "openstack",
505505
"secret": "osp-secret",
506506
"passwordSelectors": map[string]interface{}{
507-
"AuthEncryptionKey": "HeatAuthEncryptionKey",
507+
"authEncryptionKey": "HeatAuthEncryptionKey",
508508
},
509509
}
510510
telemetryTemplate := map[string]interface{}{
@@ -521,6 +521,22 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
521521
"enabled": false,
522522
},
523523
}
524+
manilaTemplate := map[string]interface{}{
525+
"rabbitMqClusterName": "rabbitmq",
526+
"memcachedInstance": "memcached",
527+
"databaseAccount": "account",
528+
"manilaAPI": map[string]interface{}{
529+
"replicas": 1,
530+
},
531+
"manilaScheduler": map[string]interface{}{
532+
"replicas": 1,
533+
},
534+
"manilaShares": map[string]interface{}{
535+
"share1": map[string]interface{}{
536+
"replicas": 1,
537+
},
538+
},
539+
}
524540

525541
return map[string]interface{}{
526542
"secret": "osp-secret",
@@ -578,11 +594,10 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
578594
"barbican": map[string]interface{}{
579595
"enabled": false,
580596
},
581-
"openstackclient": map[string]interface{}{
582-
"enabled": true,
583-
},
597+
"openstackclient": map[string]interface{}{},
584598
"manila": map[string]interface{}{
585-
"enabled": true,
599+
"enabled": true,
600+
"template": manilaTemplate,
586601
},
587602
"heat": map[string]interface{}{
588603
"enabled": true,

‎tests/functional/ctlplane/openstackoperator_controller_test.go‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,22 +1459,6 @@ var _ = Describe("OpenStackOperator controller", func() {
14591459
BeforeEach(func() {
14601460
spec := GetDefaultOpenStackControlPlaneSpec()
14611461
spec["tls"] = GetTLSPublicSpec()
1462-
spec["manila"] = map[string]interface{}{
1463-
"enabled": true,
1464-
"template": map[string]interface{}{
1465-
"manilaAPI": map[string]interface{}{
1466-
"replicas": 1,
1467-
},
1468-
"manilaScheduler": map[string]interface{}{
1469-
"replicas": 1,
1470-
},
1471-
"manilaShares": map[string]interface{}{
1472-
"share1": map[string]interface{}{
1473-
"replicas": 1,
1474-
},
1475-
},
1476-
},
1477-
}
14781462
DeferCleanup(
14791463
th.DeleteInstance,
14801464
CreateOpenStackControlPlane(names.OpenStackControlplaneName, spec),

0 commit comments

Comments
 (0)