Merge pull request #3172 from k8s-infra-cherrypick-robot/cherry-pick-3170-to-release-0.20

k8s-ci-robot · web-flow · commit 23975bcc242e · 2025-03-21T09:10:31.000-07:00
[release-0.20] 🌱 Mention the SkipNameValidation option in the name validation error
diff --git a/pkg/controller/name.go b/pkg/controller/name.go
@@ -34,7 +34,7 @@ func checkName(name string) error {
 	}
 
 	if usedNames.Has(name) {
-		return fmt.Errorf("controller with name %s already exists. Controller names must be unique to avoid multiple controllers reporting to the same metric", name)
+		return fmt.Errorf("controller with name %s already exists. Controller names must be unique to avoid multiple controllers reporting the same metric. This validation can be disabled via the SkipNameValidation option", name)
 	}
 
 	usedNames.Insert(name)

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func checkName(name string) error {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if usedNames.Has(name) {`
`37`		`- return fmt.Errorf("controller with name %s already exists. Controller names must be unique to avoid multiple controllers reporting to the same metric", name)`
	`37`	`+ return fmt.Errorf("controller with name %s already exists. Controller names must be unique to avoid multiple controllers reporting the same metric. This validation can be disabled via the SkipNameValidation option", name)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`usedNames.Insert(name)`