Setup health and ready endpoints

config/manager/deployment.yaml

@@ -28,15 +28,22 @@ spec:
  ports:
  - containerPort: 8080
  name: http-prom
+ - containerPort: 9440
+ name: healthz
+ protocol: TCP
+ readinessProbe:
+ httpGet:
+ path: /readyz
+ port: healthz
+ livenessProbe:
+ httpGet:
+ path: /healthz
+ port: healthz
  env:
  - name: RUNTIME_NAMESPACE
  valueFrom:
  fieldRef:
  fieldPath: metadata.namespace
- livenessProbe:
- httpGet:
- port: http-prom
- path: /metrics
  args:
  - --watch-all-namespaces
  - --log-level=info

main.go

@@ -26,6 +26,7 @@ import (
  _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
  "sigs.k8s.io/cli-utils/pkg/kstatus/polling"
  ctrl "sigs.k8s.io/controller-runtime"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
  crtlmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
 
  kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
@@ -54,6 +55,7 @@ func main() {
  var (
  metricsAddr string
  eventsAddr string
+ healthAddr string
  enableLeaderElection bool
  concurrent int
  requeueDependency time.Duration
@@ -64,6 +66,7 @@ func main() {
 
  flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
  flag.StringVar(&eventsAddr, "events-addr", "", "The address of the events receiver.")
+ flag.StringVar(&healthAddr, "health-addr", ":9440", "The address the health endpoint binds to.")
  flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
  "Enable leader election for controller manager. "+
  "Enabling this will ensure there is only one active controller manager.")
@@ -96,19 +99,22 @@ func main() {
  }
 
  mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
- Scheme: scheme,
- MetricsBindAddress: metricsAddr,
- Port: 9443,
- LeaderElection: enableLeaderElection,
- LeaderElectionID: "7593cc5d.fluxcd.io",
- Namespace: watchNamespace,
- Logger: ctrl.Log,
+ Scheme: scheme,
+ MetricsBindAddress: metricsAddr,
+ HealthProbeBindAddress: healthAddr,
+ Port: 9443,
+ LeaderElection: enableLeaderElection,
+ LeaderElectionID: "7593cc5d.fluxcd.io",
+ Namespace: watchNamespace,
+ Logger: ctrl.Log,
  })
  if err != nil {
  setupLog.Error(err, "unable to start manager")
  os.Exit(1)
  }
 
+ setupChecks(mgr)
+
  if err = (&controllers.GitRepositoryWatcher{
  Client: mgr.GetClient(),
  Log: ctrl.Log.WithName("controllers").WithName(sourcev1.GitRepositoryKind),
@@ -148,3 +154,15 @@ func main() {
  os.Exit(1)
  }
 }
+
+func setupChecks(mgr ctrl.Manager) {
+ if err := mgr.AddReadyzCheck("ping", healthz.Ping); err != nil {
+ setupLog.Error(err, "unable to create ready check")
+ os.Exit(1)
+ }
+
+ if err := mgr.AddHealthzCheck("ping", healthz.Ping); err != nil {
+ setupLog.Error(err, "unable to create health check")
+ os.Exit(1)
+ }
+}