[ws-manager-mk2] Configure health probes and leader election

Author: WVerlaek

components/ws-manager-api/go/config/config.go

@@ -68,6 +68,9 @@ type ServiceConfiguration struct {
 	Prometheus struct {
 		Addr string `json:"addr"`
 	} `json:"prometheus"`
+	Health struct {
+		Addr string `json:"addr"`
+	} `json:"health"`
 }
 
 // Configuration is the configuration of the ws-manager

components/ws-manager-mk2/main.go

@@ -87,7 +87,7 @@ func main() {
 		Scheme:                 scheme,
 		MetricsBindAddress:     cfg.Prometheus.Addr,
 		Port:                   9443,
-		HealthProbeBindAddress: ":9090",
+		HealthProbeBindAddress: cfg.Health.Addr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "0616d21e.gitpod.io",
 		Namespace:              cfg.Manager.Namespace,

install/installer/cmd/testdata/render/agent-smith/output.golden

@@ -266,6 +266,9 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		Prometheus: struct {
 			Addr string `json:"addr"`
 		}{Addr: common.LocalhostPrometheusAddr()},
+		Health: struct {
+			Addr string `json:"addr"`
+		}{Addr: common.LocalhostAddressFromPort(HealthPort)},
 	}
 
 	fc, err := common.ToJSONString(wsmcfg)

install/installer/cmd/testdata/render/aws-setup/output.golden

@@ -10,6 +10,7 @@ const (
 	Component                  = common.WSManagerMk2Component
 	RPCPort                    = 8080
 	RPCPortName                = "rpc"
+	HealthPort                 = 9090
 	TLSSecretNameSecret        = "ws-manager-mk2-tls"
 	TLSSecretNameClient        = "ws-manager-mk2-client-tls"
 	VolumeConfig               = "config"