Merge pull request #1152 from hakman/fix-deprecated-flag

k8s-ci-robot · web-flow · commit 030cf0fbd8df · 2025-10-07T21:30:59.000-07:00
healthchecker: Fix systemd-service flag deprecation
diff --git a/cmd/healthchecker/options/options.go b/cmd/healthchecker/options/options.go
@@ -52,11 +52,11 @@ func (hco *HealthCheckerOptions) AddFlags(fs *pflag.FlagSet) error {
 		"The component to check health for. Supports kubelet, docker, kube-proxy, and cri")
 	// Deprecated: For backward compatibility on linux environment. Going forward "service" will be used instead of systemd-service
 	if runtime.GOOS == "linux" {
+		fs.StringVar(&hco.Service, "systemd-service", "",
+			"The underlying service responsible for the component. Set to the corresponding component for docker and kubelet, containerd for cri.")
 		if err := fs.MarkDeprecated("systemd-service", "please use --service flag instead"); err != nil {
 			return fmt.Errorf("failed to mark deprecated flag 'systemd-service': %w", err)
 		}
-		fs.StringVar(&hco.Service, "systemd-service", "",
-			"The underlying service responsible for the component. Set to the corresponding component for docker and kubelet, containerd for cri.")
 	}
 	fs.StringVar(&hco.Service, "service", "",
 		"The underlying service responsible for the component. Set to the corresponding component for docker and kubelet, containerd for cri.")

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,11 @@ func (hco HealthCheckerOptions) AddFlags(fs pflag.FlagSet) error {`
`52`	`52`	`"The component to check health for. Supports kubelet, docker, kube-proxy, and cri")`
`53`	`53`	`// Deprecated: For backward compatibility on linux environment. Going forward "service" will be used instead of systemd-service`
`54`	`54`	`if runtime.GOOS == "linux" {`
	`55`	`+ fs.StringVar(&hco.Service, "systemd-service", "",`
	`56`	`+ "The underlying service responsible for the component. Set to the corresponding component for docker and kubelet, containerd for cri.")`
`55`	`57`	`if err := fs.MarkDeprecated("systemd-service", "please use --service flag instead"); err != nil {`
`56`	`58`	`return fmt.Errorf("failed to mark deprecated flag 'systemd-service': %w", err)`
`57`	`59`	`}`
`58`		`- fs.StringVar(&hco.Service, "systemd-service", "",`
`59`		`- "The underlying service responsible for the component. Set to the corresponding component for docker and kubelet, containerd for cri.")`
`60`	`60`	`}`
`61`	`61`	`fs.StringVar(&hco.Service, "service", "",`
`62`	`62`	`"The underlying service responsible for the component. Set to the corresponding component for docker and kubelet, containerd for cri.")`