fix(proxy): make readiness probe work out of the box in hostNetwork mode

Before we had to configure the port and host in the values, now it works by default.
enix · Dec 27, 2023 · e606d43 · e606d43
1 parent 5371b03
commit e606d43
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/helm/kube-image-keeper/templates/proxy-daemonset.yaml b/helm/kube-image-keeper/templates/proxy-daemonset.yaml
@@ -47,7 +47,7 @@ spec:
               name: metrics
               protocol: TCP
             {{- else }}
-            - containerPort: 8082
+            - containerPort: {{ .Values.proxy.hostPort }}
               hostIP: {{ .Values.proxy.hostIp }}
               hostPort: {{ .Values.proxy.hostPort }}
               protocol: TCP
@@ -74,6 +74,8 @@ spec:
             {{- if .Values.proxy.hostNetwork }}
             - -bind-address={{ .Values.proxy.hostIp }}:{{ .Values.proxy.hostPort }}
             - -metrics-bind-address={{ .Values.proxy.hostIp }}:{{ .Values.proxy.metricsPort }}
+            {{- else }}
+            - -bind-address=:{{ .Values.proxy.hostPort }}
             {{- end }}
           {{- if .Values.rootCertificateAuthorities }}
           {{- with .Values.proxy.env }}
@@ -85,9 +87,13 @@ spec:
               name: registry-certificate-authorities
               readOnly: true
           {{- end }}
+          {{- $readinessProbe := deepCopy .Values.proxy.readinessProbe }}
+          {{- if .Values.proxy.hostNetwork }}
+            {{- $readinessProbe := merge $readinessProbe.httpGet (dict "host" "localhost") }}
+          {{- end }}
           {{- with .Values.proxy.readinessProbe }}
           readinessProbe:
-            {{- toYaml . | nindent 12 }}
+            {{- $readinessProbe | toYaml | nindent 12 }}
           {{- end }}
           {{- with .Values.proxy.resources }}
           resources:

diff --git a/helm/kube-image-keeper/values.yaml b/helm/kube-image-keeper/values.yaml
@@ -164,7 +164,7 @@ proxy:
   readinessProbe:
     httpGet:
       path: /v2/
-      port: 8082
+      port: 7439
   resources:
     requests:
       # -- Cpu requests for the proxy pod