Skip to content

Add liveness/readiness probes #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 17, 2020
Merged

Add liveness/readiness probes #329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/manager"
)

Expand All @@ -39,7 +40,16 @@ func main() {
flag.BoolVar(&printVersion, "version", false, "print version and exit")

klog.InitFlags(nil)
watchNamespace := flag.String("namespace", "", "Namespace that the controller watches to reconcile machine-api objects. If unspecified, the controller watches for machine-api objects across all namespaces.")
watchNamespace := flag.String(
"namespace",
"",
"Namespace that the controller watches to reconcile machine-api objects. If unspecified, the controller watches for machine-api objects across all namespaces.",
)
healthAddr := flag.String(
"health-addr",
":9440",
Copy link
Member

@enxebre enxebre Jun 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did we choose this default?

Copy link
Author

@Danil-Grigorev Danil-Grigorev Jun 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a number similar to upstream implementation. There is no standard: https://github.com/kubernetes-sigs/cluster-api-provider-aws/pull/1487/files#r367928052

"The address for health checking.",
)
flag.Set("logtostderr", "true")
flag.Parse()

Expand All @@ -59,7 +69,8 @@ func main() {
opts := manager.Options{
SyncPeriod: &syncPeriod,
// Disable metrics serving
MetricsBindAddress: "0",
MetricsBindAddress: "0",
HealthProbeBindAddress: *healthAddr,
}
if *watchNamespace != "" {
opts.Namespace = *watchNamespace
Expand Down Expand Up @@ -96,6 +107,15 @@ func main() {
setupLog.Error(err, "unable to create controller", "controller", "MachineSet")
os.Exit(1)
}

if err := mgr.AddReadyzCheck("ping", healthz.Ping); err != nil {
klog.Fatal(err)
}

if err := mgr.AddHealthzCheck("ping", healthz.Ping); err != nil {
klog.Fatal(err)
}

// Start the Cmd
err = mgr.Start(ctrl.SetupSignalHandler())
if err != nil {
Expand Down