Explicitly specify liveness and readiness probe ports

giantswarm · Oct 22, 2024 · 55aa40d · 55aa40d
1 parent a6e83ae
commit 55aa40d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 ## [Unreleased]
 
+### Changed
+
+- Explicitly expose liveness and readiness probe ports in deployments.
+
 ## [1.22.0] - 2024-09-10
 
 ### Changed

diff --git a/helm/coredns-app/templates/configmap.yaml b/helm/coredns-app/templates/configmap.yaml
@@ -13,10 +13,10 @@ data:
         template ANY AAAA {
           rcode NOERROR
         }
-        health {
+        health :8080 {
           lameduck 5s
         }
-        ready
+        ready :8181
         log . {
           {{- range (.Values.configmap.log | trimAll "\n " |  split "\n") }}
           class {{ . }}
@@ -56,10 +56,10 @@ data:
           rcode NOERROR
         }
         cache
-        health {
+        health :8080 {
           lameduck 5s
         }
-        ready
+        ready :8181
         kubernetes {{ $domain }} {{- if (regexMatch ".local$" $domain ) }} {{ $clusterIPRange }} {{ $calicoCIDR }} {{- end }} {
           pods verified
         }
@@ -84,10 +84,10 @@ data:
           rcode NOERROR
         }
         cache
-        health {
+        health :8080 {
           lameduck 5s
         }
-        ready
+        ready :8181
         kubernetes {{ $domain }} {
           pods verified
         }

diff --git a/helm/coredns-app/templates/deployment-masters.yaml b/helm/coredns-app/templates/deployment-masters.yaml
@@ -91,14 +91,20 @@ spec:
         - containerPort: {{ .Values.ports.prometheus }}
           name: http-metrics
           protocol: TCP
+        - containerPort: 8080
+          name: health
+          protocol: TCP
+        - containerPort: 8181
+          name: ready
+          protocol: TCP
         {{- with .Values.resources }}
-        resources: 
+        resources:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         livenessProbe:
           httpGet:
             path: /health
-            port: 8080
+            port: health
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
@@ -107,7 +113,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /ready
-            port: 8181
+            port: ready
             scheme: HTTP
           initialDelaySeconds: 10
           timeoutSeconds: 5

diff --git a/helm/coredns-app/templates/deployment-workers.yaml b/helm/coredns-app/templates/deployment-workers.yaml
@@ -75,14 +75,20 @@ spec:
         - containerPort: {{ .Values.ports.prometheus }}
           name: http-metrics
           protocol: TCP
+        - containerPort: 8080
+          name: health
+          protocol: TCP
+        - containerPort: 8181
+          name: ready
+          protocol: TCP
         {{- with .Values.resources }}
-        resources: 
+        resources:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         livenessProbe:
           httpGet:
             path: /health
-            port: 8080
+            port: health
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
@@ -91,7 +97,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /ready
-            port: 8181
+            port: ready
             scheme: HTTP
           initialDelaySeconds: 10
           timeoutSeconds: 5