Merge pull request kubernetes#114691 from thockin/fix-pod-warning-string

k8s-ci-robot · web-flow · commit 564f43889209 · 2023-01-10T13:47:38.000-08:00
Make the warning about pod name clearer
diff --git a/pkg/registry/core/pod/strategy.go b/pkg/registry/core/pod/strategy.go
@@ -114,7 +114,7 @@ func (podStrategy) WarningsOnCreate(ctx context.Context, obj runtime.Object) []s
 	newPod := obj.(*api.Pod)
 	var warnings []string
 	if msgs := utilvalidation.IsDNS1123Label(newPod.Name); len(msgs) != 0 {
-		warnings = append(warnings, fmt.Sprintf("metadata.name: this is used in Pod names and hostnames, which can result in surprising behavior; a DNS label is recommended: %v", msgs))
+		warnings = append(warnings, fmt.Sprintf("metadata.name: this is used in the Pod's hostname, which can result in surprising behavior; a DNS label is recommended: %v", msgs))
 	}
 	warnings = append(warnings, podutil.GetWarningsForPod(ctx, newPod, nil)...)
 	return warnings

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (podStrategy) WarningsOnCreate(ctx context.Context, obj runtime.Object) []s`
`114`	`114`	`newPod := obj.(*api.Pod)`
`115`	`115`	`var warnings []string`
`116`	`116`	`if msgs := utilvalidation.IsDNS1123Label(newPod.Name); len(msgs) != 0 {`
`117`		`- warnings = append(warnings, fmt.Sprintf("metadata.name: this is used in Pod names and hostnames, which can result in surprising behavior; a DNS label is recommended: %v", msgs))`
	`117`	`+ warnings = append(warnings, fmt.Sprintf("metadata.name: this is used in the Pod's hostname, which can result in surprising behavior; a DNS label is recommended: %v", msgs))`
`118`	`118`	`}`
`119`	`119`	`warnings = append(warnings, podutil.GetWarningsForPod(ctx, newPod, nil)...)`
`120`	`120`	`return warnings`