Merge pull request #353 from shiftstack/fix-pod-disruption-budget-name

openshift-merge-bot[bot] · web-flow · commit 8a67b266c8ab · 2025-01-20T12:16:45.000Z
OCPBUGS-48507: openstack-manila: update PodDisruptionBudget name
diff --git a/assets/overlays/openstack-manila/generated/hypershift/controller_pdb.yaml b/assets/overlays/openstack-manila/generated/hypershift/controller_pdb.yaml
@@ -1,14 +1,14 @@
 # Generated file. Do not edit. Update using "make update".
 #
 # Loaded from base/controller_pdb.yaml
-# Applied strategic merge patch overlays/openstack-manila/patches/modify_match_labels.yaml
+# Applied strategic merge patch overlays/openstack-manila/patches/modify_pdb.yaml
 #
 #
 
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: manila-csi-driver-controller-pdb
+  name: openstack-manila-csi-controllerplugin-pdb
   namespace: ${NAMESPACE}
 spec:
   maxUnavailable: 1
diff --git a/assets/overlays/openstack-manila/generated/standalone/controller_pdb.yaml b/assets/overlays/openstack-manila/generated/standalone/controller_pdb.yaml
@@ -1,14 +1,14 @@
 # Generated file. Do not edit. Update using "make update".
 #
 # Loaded from base/controller_pdb.yaml
-# Applied strategic merge patch overlays/openstack-manila/patches/modify_match_labels.yaml
+# Applied strategic merge patch overlays/openstack-manila/patches/modify_pdb.yaml
 #
 #
 
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: manila-csi-driver-controller-pdb
+  name: openstack-manila-csi-controllerplugin-pdb
   namespace: ${NAMESPACE}
 spec:
   maxUnavailable: 1
diff --git a/assets/overlays/openstack-manila/patches/modify_pdb.yaml b/assets/overlays/openstack-manila/patches/modify_pdb.yaml
@@ -1,3 +1,5 @@
+metadata:
+  name: openstack-manila-csi-controllerplugin-pdb
 spec:
   selector:
     matchLabels:
diff --git a/pkg/driver/openstack-manila/openstack_manila.go b/pkg/driver/openstack-manila/openstack_manila.go
@@ -86,7 +86,7 @@ func GetOpenStackManilaGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 				"controller.yaml", "overlays/openstack-manila/patches/controller_rename_config_map.yaml",
 			).WithPatches(generator.AllFlavours,
 				"service.yaml", "overlays/openstack-manila/patches/modify_service_selector.yaml",
-				"controller_pdb.yaml", "overlays/openstack-manila/patches/modify_match_labels.yaml",
+				"controller_pdb.yaml", "overlays/openstack-manila/patches/modify_pdb.yaml",
 				"controller.yaml", "overlays/openstack-manila/patches/modify_anti_affinity_selector.yaml",
 			),
 		},

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`# Generated file. Do not edit. Update using "make update".`
`2`	`2`	`#`
`3`	`3`	`# 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`
`5`	`5`	`#`
`6`	`6`	`#`
`7`	`7`
`8`	`8`	`apiVersion: policy/v1`
`9`	`9`	`kind: PodDisruptionBudget`
`10`	`10`	`metadata:`
`11`		`- name: manila-csi-driver-controller-pdb`
	`11`	`+ name: openstack-manila-csi-controllerplugin-pdb`
`12`	`12`	`namespace: ${NAMESPACE}`
`13`	`13`	`spec:`
`14`	`14`	`maxUnavailable: 1`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+metadata:`
	`2`	`+ name: openstack-manila-csi-controllerplugin-pdb`
`1`	`3`	`spec:`
`2`	`4`	`selector:`
`3`	`5`	`matchLabels:`