Merge pull request #1138 from openshift-cherrypick-robot/cherry-pick-…

…1137-to-v1.3.x [v1.3.x] [OSP-33530] Allow roles_data.yaml to have `./` prefix for checking fencing roles
openstack-k8s-operators · Jan 28, 2025 · e932ba6 · e932ba6
2 parents ad6ea78 + 081f147
commit e932ba6
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/pkg/common/fencing.go b/pkg/common/fencing.go
@@ -59,7 +59,7 @@ func GetCustomFencingRoles(customBinaryData map[string][]byte) ([]string, error)
 
 			switch header.Typeflag {
 			case tar.TypeReg:
-				if header.Name == TripleORolesDataFile {
+				if header.Name == TripleORolesDataFile || header.Name == "./"+TripleORolesDataFile {
 					buf, err := io.ReadAll(tarReader)
 
 					if err != nil {