Skip to content

Commit 2a95caf

Browse files
committed
openstack-manila: update PodDisruptionBudget name
In previous releases the PodDisruptionBudget is named openstack-manila-csi-controllerplugin-pdb instead of manila-csi-driver-controller-pdb, which is the name currently generated by csi-operator. This prevents upgrades from being successful. To fix the issue the asset is renamed with the same name as used in previous releases.
1 parent a22ac11 commit 2a95caf

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

assets/overlays/openstack-manila/generated/hypershift/controller_pdb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Generated file. Do not edit. Update using "make update".
22
#
33
# Loaded from base/controller_pdb.yaml
4-
# Applied strategic merge patch overlays/openstack-manila/patches/modify_match_labels.yaml
4+
# Applied strategic merge patch overlays/openstack-manila/patches/modify_pdb.yaml
55
#
66
#
77

88
apiVersion: policy/v1
99
kind: PodDisruptionBudget
1010
metadata:
11-
name: manila-csi-driver-controller-pdb
11+
name: openstack-manila-csi-controllerplugin-pdb
1212
namespace: ${NAMESPACE}
1313
spec:
1414
maxUnavailable: 1

assets/overlays/openstack-manila/generated/standalone/controller_pdb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Generated file. Do not edit. Update using "make update".
22
#
33
# Loaded from base/controller_pdb.yaml
4-
# Applied strategic merge patch overlays/openstack-manila/patches/modify_match_labels.yaml
4+
# Applied strategic merge patch overlays/openstack-manila/patches/modify_pdb.yaml
55
#
66
#
77

88
apiVersion: policy/v1
99
kind: PodDisruptionBudget
1010
metadata:
11-
name: manila-csi-driver-controller-pdb
11+
name: openstack-manila-csi-controllerplugin-pdb
1212
namespace: ${NAMESPACE}
1313
spec:
1414
maxUnavailable: 1

assets/overlays/openstack-manila/patches/modify_match_labels.yaml renamed to assets/overlays/openstack-manila/patches/modify_pdb.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
metadata:
2+
name: openstack-manila-csi-controllerplugin-pdb
13
spec:
24
selector:
35
matchLabels:

pkg/driver/openstack-manila/openstack_manila.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func GetOpenStackManilaGeneratorConfig() *generator.CSIDriverGeneratorConfig {
8686
"controller.yaml", "overlays/openstack-manila/patches/controller_rename_config_map.yaml",
8787
).WithPatches(generator.AllFlavours,
8888
"service.yaml", "overlays/openstack-manila/patches/modify_service_selector.yaml",
89-
"controller_pdb.yaml", "overlays/openstack-manila/patches/modify_match_labels.yaml",
89+
"controller_pdb.yaml", "overlays/openstack-manila/patches/modify_pdb.yaml",
9090
"controller.yaml", "overlays/openstack-manila/patches/modify_anti_affinity_selector.yaml",
9191
),
9292
},

0 commit comments

Comments
 (0)