Merge pull request #1910 from camilamacedo86/fix-checks

k8s-ci-robot · web-flow · commit 032f0c4c0af6 · 2021-01-18T12:59:44.000-08:00
✨ rename probes endpoints (go/v3)
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/main.go b/docs/book/src/cronjob-tutorial/testdata/project/main.go
@@ -124,11 +124,11 @@ func main() {
 	}
 	//+kubebuilder:scaffold:builder
 
-	if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/main.go b/docs/book/src/multiversion-tutorial/testdata/project/main.go
@@ -119,11 +119,11 @@ func main() {
 	/*
 	 */
 	
-	if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go
@@ -268,11 +268,11 @@ func main() {
 
 	%s
 
-	if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
diff --git a/testdata/project-v3-addon/main.go b/testdata/project-v3-addon/main.go
@@ -104,11 +104,11 @@ func main() {
 	}
 	//+kubebuilder:scaffold:builder
 
-	if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
diff --git a/testdata/project-v3-config/main.go b/testdata/project-v3-config/main.go
@@ -132,11 +132,11 @@ func main() {
 	}
 	//+kubebuilder:scaffold:builder
 
-	if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
diff --git a/testdata/project-v3-multigroup/main.go b/testdata/project-v3-multigroup/main.go
@@ -191,11 +191,11 @@ func main() {
 	}
 	//+kubebuilder:scaffold:builder
 
-	if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
diff --git a/testdata/project-v3/main.go b/testdata/project-v3/main.go
@@ -136,11 +136,11 @@ func main() {
 	}
 	//+kubebuilder:scaffold:builder
 
-	if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}

Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,11 @@ func main() {`
`124`	`124`	`}`
`125`	`125`	`//+kubebuilder:scaffold:builder`
`126`	`126`
`127`		`- if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {`
	`127`	`+ if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {`
`128`	`128`	`setupLog.Error(err, "unable to set up health check")`
`129`	`129`	`os.Exit(1)`
`130`	`130`	`}`
`131`		`- if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {`
	`131`	`+ if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {`
`132`	`132`	`setupLog.Error(err, "unable to set up ready check")`
`133`	`133`	`os.Exit(1)`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,11 +119,11 @@ func main() {`
`119`	`119`	`/*`
`120`	`120`	`*/`
`121`	`121`
`122`		`- if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {`
	`122`	`+ if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {`
`123`	`123`	`setupLog.Error(err, "unable to set up health check")`
`124`	`124`	`os.Exit(1)`
`125`	`125`	`}`
`126`		`- if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {`
	`126`	`+ if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {`
`127`	`127`	`setupLog.Error(err, "unable to set up ready check")`
`128`	`128`	`os.Exit(1)`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,11 +268,11 @@ func main() {`
`268`	`268`
`269`	`269`	`%s`
`270`	`270`
`271`		`- if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {`
	`271`	`+ if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {`
`272`	`272`	`setupLog.Error(err, "unable to set up health check")`
`273`	`273`	`os.Exit(1)`
`274`	`274`	`}`
`275`		`- if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {`
	`275`	`+ if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {`
`276`	`276`	`setupLog.Error(err, "unable to set up ready check")`
`277`	`277`	`os.Exit(1)`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,11 @@ func main() {`
`104`	`104`	`}`
`105`	`105`	`//+kubebuilder:scaffold:builder`
`106`	`106`
`107`		`- if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {`
	`107`	`+ if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {`
`108`	`108`	`setupLog.Error(err, "unable to set up health check")`
`109`	`109`	`os.Exit(1)`
`110`	`110`	`}`
`111`		`- if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {`
	`111`	`+ if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {`
`112`	`112`	`setupLog.Error(err, "unable to set up ready check")`
`113`	`113`	`os.Exit(1)`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,11 @@ func main() {`
`132`	`132`	`}`
`133`	`133`	`//+kubebuilder:scaffold:builder`
`134`	`134`
`135`		`- if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {`
	`135`	`+ if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {`
`136`	`136`	`setupLog.Error(err, "unable to set up health check")`
`137`	`137`	`os.Exit(1)`
`138`	`138`	`}`
`139`		`- if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {`
	`139`	`+ if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {`
`140`	`140`	`setupLog.Error(err, "unable to set up ready check")`
`141`	`141`	`os.Exit(1)`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,11 +191,11 @@ func main() {`
`191`	`191`	`}`
`192`	`192`	`//+kubebuilder:scaffold:builder`
`193`	`193`
`194`		`- if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {`
	`194`	`+ if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {`
`195`	`195`	`setupLog.Error(err, "unable to set up health check")`
`196`	`196`	`os.Exit(1)`
`197`	`197`	`}`
`198`		`- if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {`
	`198`	`+ if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {`
`199`	`199`	`setupLog.Error(err, "unable to set up ready check")`
`200`	`200`	`os.Exit(1)`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,11 +136,11 @@ func main() {`
`136`	`136`	`}`
`137`	`137`	`//+kubebuilder:scaffold:builder`
`138`	`138`
`139`		`- if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {`
	`139`	`+ if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {`
`140`	`140`	`setupLog.Error(err, "unable to set up health check")`
`141`	`141`	`os.Exit(1)`
`142`	`142`	`}`
`143`		`- if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {`
	`143`	`+ if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {`
`144`	`144`	`setupLog.Error(err, "unable to set up ready check")`
`145`	`145`	`os.Exit(1)`
`146`	`146`	`}`