don't return error and don't convert to lowercase

stackhpc · Sep 3, 2024 · 3572c6a · 3572c6a
1 parent bddc345
commit 3572c6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/pkg/openstack/instancesv2.go b/pkg/openstack/instancesv2.go
@@ -134,10 +134,7 @@ func (i *InstancesV2) InstanceMetadata(ctx context.Context, node *v1.Node) (*clo
 		return nil, err
 	}
 
-	availabilityZone, err := util.SanitizeLabel(server.AvailabilityZone)
-	if err != nil {
-		return nil, err
-	}
+	availabilityZone := util.SanitizeLabel(server.AvailabilityZone)
 
 	return &cloudprovider.InstanceMetadata{
 		ProviderID:    i.makeInstanceID(&server),

diff --git a/pkg/util/metadata/metadata.go b/pkg/util/metadata/metadata.go
@@ -306,7 +306,7 @@ func (m *metadataService) GetAvailabilityZone() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return util.SanitizeLabel(md.AvailabilityZone)
+	return util.SanitizeLabel(md.AvailabilityZone), nil
 }
 
 func CheckMetadataSearchOrder(order string) error {

diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -169,7 +169,7 @@ func GetAZFromTopology(topologyKey string, requirement *csi.TopologyRequirement)
 	return zone
 }
 
-func SanitizeLabel(input string) (string, error) {
+func SanitizeLabel(input string) string {
 	// Replace non-alphanumeric characters (except '-', '_', '.') with '-'
 	reg := regexp.MustCompile(`[^-a-zA-Z0-9_.]+`)
 	sanitized := reg.ReplaceAllString(input, "-")
@@ -182,6 +182,5 @@ func SanitizeLabel(input string) (string, error) {
 		sanitized = sanitized[:63]
 	}
 
-	// Convert to lowercase
-	return strings.ToLower(sanitized), nil
+	return sanitized
 }