Merge pull request #2651 from elinx/feat-admission-healthz

add healthz for admission

cmd/webhook-manager/app/options/options.go

@@ -31,6 +31,7 @@ const (
 	defaultBurst             = 100
 	defaultEnabledAdmission  = "/jobs/mutate,/jobs/validate,/podgroups/mutate,/pods/validate,/pods/mutate,/queues/mutate,/queues/validate"
 	defaultIgnoredNamespaces = "volcano-system,kube-system"
+	defaultHealthzAddress    = ":11251"
 )
 
 // Config admission-controller server config.
@@ -52,6 +53,11 @@ type Config struct {
 	ConfigPath        string
 	EnabledAdmission  string
 	IgnoredNamespaces string
+
+	EnableHealthz bool
+	// HealthzBindAddress is the IP address and port for the health check server to serve on
+	// defaulting to :11251
+	HealthzBindAddress string
 }
 
 type DecryptFunc func(c *Config) error
@@ -83,6 +89,8 @@ func (c *Config) AddFlags(fs *pflag.FlagSet) {
 	fs.StringArrayVar(&c.SchedulerNames, "scheduler-name", []string{defaultSchedulerName}, "Volcano will handle pods whose .spec.SchedulerName is same as scheduler-name")
 	fs.StringVar(&c.ConfigPath, "admission-conf", "", "The configmap file of this webhook")
 	fs.StringVar(&c.IgnoredNamespaces, "ignored-namespaces", defaultIgnoredNamespaces, "Comma-separated list of namespaces to be ignored by admission webhooks")
+	fs.BoolVar(&c.EnableHealthz, "enable-healthz", false, "Enable the health check; it is false by default")
+	fs.StringVar(&c.HealthzBindAddress, "healthz-address", defaultHealthzAddress, "The address to listen on for the health check server.")
 }
 
 // CheckPortOrDie check valid port range.

cmd/webhook-manager/app/server.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog"
 
+	"volcano.sh/apis/pkg/apis/helpers"
 	"volcano.sh/apis/pkg/apis/scheduling/scheme"
 	"volcano.sh/volcano/cmd/webhook-manager/app/options"
 	"volcano.sh/volcano/pkg/kube"
@@ -45,6 +46,12 @@ func Run(config *options.Config) error {
 		return nil
 	}
 
+	if config.EnableHealthz {
+		if err := helpers.StartHealthz(config.HealthzBindAddress, "volcano-admission", config.CertData, config.KeyData); err != nil {
+			return err
+		}
+	}
+
 	if config.WebhookURL == "" && config.WebhookNamespace == "" && config.WebhookName == "" {
 		return fmt.Errorf("failed to start webhooks as both 'url' and 'namespace/name' of webhook are empty")
 	}

installer/helm/chart/volcano/templates/admission.yaml

@@ -91,6 +91,7 @@ spec:
             - --admission-conf=/admission.local.config/configmap/{{base .Values.basic.admission_config_file}}
             - --webhook-namespace={{ .Release.Namespace }}
             - --webhook-service-name={{ .Release.Name }}-admission-service
+            - --enable-healthz=true
             - --logtostderr
             - --port={{.Values.basic.admission_port}}
             - -v=4

installer/volcano-development.yaml

@@ -145,6 +145,7 @@ spec:
             - --admission-conf=/admission.local.config/configmap/volcano-admission.conf
             - --webhook-namespace=volcano-system
             - --webhook-service-name=volcano-admission-service
+            - --enable-healthz=true
             - --logtostderr
             - --port=8443
             - -v=4