fix: konnectivity ports and healthcheck

Author: kvaps

deploy/helm/kubernetes/manifests/konnectivity-agent-deployment.yaml

@@ -60,7 +60,7 @@ spec:
         {{- end }}
         {{- end }}
 
-        {{- if not (hasKey .Values.konnectivityAgent.extraArgs "roxy-server-port") }}
+        {{- if not (hasKey .Values.konnectivityAgent.extraArgs "proxy-server-port") }}
         {{- if eq .Values.konnectivityServer.service.type "LoadBalancer" }}
         - --proxy-server-port={{ .Values.konnectivityServer.service.ports.agent }}
         {{- else if .Values.konnectivityServer.service.NodePort }}
@@ -70,9 +70,17 @@ spec:
         {{- end }}
         {{- end }}
 
+        - --admin-server-port={{ .Values.konnectivityAgent.ports.admin }}
+        - --health-server-port={{ .Values.konnectivityAgent.ports.health }}
+
         {{- range $key, $value := .Values.konnectivityAgent.extraArgs }}
         - --{{ $key }}={{ $value }}
         {{- end }}
+        ports:
+        - containerPort: {{ .Values.konnectivityAgent.ports.admin }}
+          name: admin
+        - containerPort: {{ .Values.konnectivityAgent.ports.health }}
+          name: health
         volumeMounts:
         - mountPath: /var/run/secrets/tokens
           name: konnectivity-agent-token
@@ -81,8 +89,9 @@ spec:
         {{- end }}
         livenessProbe:
           httpGet:
-            port: 8093
             path: /healthz
+            port: {{ .Values.konnectivityAgent.ports.health }}
+            scheme: HTTP
           initialDelaySeconds: 15
           timeoutSeconds: 15
       {{- with .Values.konnectivityAgent.sidecars }}

deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml

@@ -63,6 +63,7 @@ spec:
         - --server-port={{ .Values.konnectivityServer.ports.server }}
         - --agent-port={{ .Values.konnectivityServer.ports.agent }}
         - --admin-port={{ .Values.konnectivityServer.ports.admin }}
+        - --health-port={{ .Values.konnectivityServer.ports.health }}
         - --agent-namespace=kube-system
         - --agent-service-account=konnectivity-agent
         - --kubeconfig=/etc/kubernetes/konnectivity-server.conf
@@ -77,14 +78,16 @@ spec:
           name: agent
         - containerPort: {{ .Values.konnectivityServer.ports.admin }}
           name: admin
+        - containerPort: {{ .Values.konnectivityServer.ports.health }}
+          name: health
         image: {{ .Values.konnectivityServer.image.repository }}:{{ .Values.konnectivityServer.image.tag }}
         imagePullPolicy: {{ .Values.konnectivityServer.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8
           httpGet:
             path: /healthz
-            port: {{ .Values.konnectivityServer.ports.admin }}
-            scheme: HTTPS
+            port: {{ .Values.konnectivityServer.ports.health }}
+            scheme: HTTP
           initialDelaySeconds: 30
           timeoutSeconds: 60
         name: konnectivity-server

deploy/helm/kubernetes/templates/konnectivity-server-service.yaml

@@ -33,11 +33,6 @@ spec:
     {{- with .Values.konnectivityServer.service.nodePorts.client }}
     nodePort: {{ . }}
     {{- end }}
-  - port: {{ .Values.konnectivityServer.ports.admin }}
-    name: admin
-    {{- with .Values.konnectivityServer.service.nodePorts.admin }}
-    nodePort: {{ . }}
-    {{- end }}
   selector:
     app: {{ $fullName }}-konnectivity-server
 {{- end }}

deploy/helm/kubernetes/values.yaml

@@ -264,6 +264,7 @@ konnectivityServer:
     server: 8131
     agent: 8132
     admin: 8133
+    health: 8134
   service:
     enabled: true
     type: ClusterIP
@@ -302,6 +303,10 @@ konnectivityAgent:
   extraVolumes: []
   extraVolumeMounts: []
 
+  ports:
+    admin: 8133
+    health: 8134
+
 # these manifests will be applied inside the cluster
 extraManifests: {}
   #namespace.yaml: