update

pkg/naming.go

@@ -82,12 +82,20 @@ func addNameOverride(key, value string, m map[string]string) {
 	m[key] = value
 }
 
+// getSingularNameForResource returns a singular version of a resource name,
+// as long as the name doesn't have one of the valid plural names as its
+// suffix.
 func getSingularNameForResource(resourceName string, allowedPluralNames []string) string {
+	allowPluralName := false
 	for _, n := range allowedPluralNames {
-		if !strings.HasSuffix(resourceName, n) {
-			return strings.TrimSuffix(resourceName, "s")
+		if strings.HasSuffix(resourceName, n) {
+			allowPluralName = true
 		}
 	}
 
+	if !allowPluralName {
+		return strings.TrimSuffix(resourceName, "s")
+	}
+
 	return resourceName
 }