Add configurable Livenessprobe support to helm chart (aws#436)

config/helm/appmesh-controller/README.md

@@ -359,3 +359,4 @@ Parameter | Description | Default
 `xray.image.tag` | X-Ray image tag | `latest`
 `accountId` | AWS Account ID for the Kubernetes cluster | None
 `env` |  environment variables to be injected into the appmesh-controller pod | `{}`
+`livenessProbe` | Liveness probe settings for the controller | (see `values.yaml`)

config/helm/appmesh-controller/templates/deployment.yaml

@@ -104,6 +104,8 @@ spec:
         - --aws-account-id={{ .Values.accountId }}
         {{- end }}
         - --sidecar-log-level={{ .Values.sidecar.logLevel }}
+        # this must be same as livenessProbe port which can be configured 
+        - --health-probe-port={{ .Values.livenessProbe.httpGet.port }}
         {{- if .Values.env }}
         env:
           {{- range $key, $value := .Values.env }}
@@ -113,6 +115,8 @@ spec:
         {{- end}}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
+        livenessProbe:
+{{ toYaml .Values.livenessProbe | indent 10 }}
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

config/helm/appmesh-controller/test.yaml

@@ -144,3 +144,13 @@ env: {}
 #    http_proxy: http://proxyserver:3128
 #    https_proxy: http://proxyserver:3128
 #    no_proxy: "localhost,127.0.0.1,.cluster.local"
+
+# Liveness probe configuration for the appmesh-controller pod
+livenessProbe:
+  failureThreshold: 2
+  httpGet:
+    path: /healthz
+    port: 61779
+    scheme: HTTP
+  initialDelaySeconds: 30
+  timeoutSeconds: 10

config/helm/appmesh-controller/values.yaml

@@ -130,3 +130,13 @@ env: {}
 #    http_proxy: http://proxyserver:3128
 #    https_proxy: http://proxyserver:3128
 #    no_proxy: "localhost,127.0.0.1,.cluster.local"
+
+# Liveness probe configuration for the controller
+livenessProbe:
+  failureThreshold: 2
+  httpGet:
+    path: /healthz
+    port: 61779
+    scheme: HTTP
+  initialDelaySeconds: 30
+  timeoutSeconds: 10

main.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"os"
+	"strconv"
 	"time"
 
 	"github.com/aws/aws-app-mesh-controller-for-k8s/pkg/aws/throttle"
@@ -60,8 +61,8 @@ import (
 )
 
 const (
-	flagHealthProbeBindAddr       = "health-probe-bind-addr"
-	defaultHealthProbeBindAddress = ":61779"
+	flagHealthProbePort    = "health-probe-port"
+	defaultHealthProbePort = 61779
 )
 
 var (
@@ -83,7 +84,7 @@ func main() {
 	var enableCustomHealthCheck bool
 	var logLevel string
 	var listPageLimit int64
-	var healthProbeBindAddress string
+	var healthProbePort int
 	awsCloudConfig := aws.CloudConfig{ThrottleConfig: throttle.NewDefaultServiceOperationsThrottleConfig()}
 	injectConfig := inject.Config{}
 	cloudMapConfig := cloudmap.Config{}
@@ -98,8 +99,8 @@ func main() {
 	fs.StringVar(&logLevel, "log-level", "info", "Set the controller log level - info(default), debug")
 	fs.Int64Var(&listPageLimit, "page-limit", 100,
 		"The page size limiting the number of response for list operation to API Server")
-	fs.StringVar(&healthProbeBindAddress, flagHealthProbeBindAddr, defaultHealthProbeBindAddress,
-		"The address the health probes binds to.")
+	fs.IntVar(&healthProbePort, flagHealthProbePort, defaultHealthProbePort,
+		"The port the health probes binds to.")
 
 	awsCloudConfig.BindFlags(fs)
 	injectConfig.BindFlags(fs)
@@ -124,6 +125,10 @@ func main() {
 		"BuildDate", version.BuildDate,
 	)
 
+	parsedPort := strconv.Itoa(healthProbePort)
+	healthProbeBindAddress := ":" + parsedPort
+	setupLog.Info("Health endpoint", "HealthProbeBindAddress", healthProbeBindAddress)
+
 	eventNotificationChan := make(chan k8s.GenericEvent)
 
 	kubeConfig := ctrl.GetConfigOrDie()