Standarize port handling

Author: jacekn

charts/friendbot/templates/friendbot-deployment.yaml

@@ -61,15 +61,16 @@ spec:
         {{- end }}
         imagePullPolicy: {{ .Values.global.image.friendbot.pullPolicy }}
         ports:
-        - containerPort: {{ .Values.friendbot.service.targetport | default 8004 }}
+        - containerPort: {{ .Values.friendbot.configmap.port | default 8000 }}
           protocol: TCP
+        {{- with .Values.friendbot.deployment.container.startupProbe }}
+        {{- $startupProbe := deepCopy . }}
+        {{- if and (hasKey $startupProbe "tcpSocket") (kindIs "map" $startupProbe.tcpSocket) (not (hasKey $startupProbe.tcpSocket "port")) }}
+        {{- $_ := set $startupProbe.tcpSocket "port" ($.Values.friendbot.configmap.port | default 8000) }}
+        {{- end }}
         startupProbe:
-          tcpSocket:
-            port: {{ .Values.friendbot.deployment.container.startupProbe.tcpSocketPort }}
-          initialDelaySeconds: {{ .Values.friendbot.deployment.container.startupProbe.initialDelaySeconds }}
-          failureThreshold: {{ .Values.friendbot.deployment.container.startupProbe.failureThreshold }}
-          periodSeconds: {{ .Values.friendbot.deployment.container.startupProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.friendbot.deployment.container.startupProbe.timeoutSeconds }}
+          {{- toYaml $startupProbe | nindent 10 }}
+        {{- end }}
         volumeMounts:
         - name: friendbot-secret
           mountPath: /secret
@@ -83,4 +84,4 @@ spec:
             secretName: {{ include "friendbot.secretName" . }}
         - name: friendbot-conf
           configMap:
-            name: {{ template "common.fullname" . }}-config
+            name: {{ template "common.fullname" . }}-config

charts/friendbot/templates/friendbot-ingress.yaml

@@ -30,4 +30,4 @@ spec:
           service:
             name: {{ template "common.fullname" . }}
             port:
-              number: {{ .Values.friendbot.ingress.port | default 80 }}
+              number: {{ .Values.friendbot.configmap.port | default 8000 }}

charts/friendbot/templates/friendbot-service.yaml

@@ -15,7 +15,7 @@ spec:
   type: ClusterIP
   ports:
   - protocol: TCP
-    port: {{ .Values.friendbot.service.port | default 80 }}
-    targetPort: {{ .Values.friendbot.service.targetport | default 8004 }}
+    port: {{ .Values.friendbot.configmap.port | default 8000 }}
+    targetPort: {{ .Values.friendbot.configmap.port | default 8000 }}
   selector:
     app: {{ template "common.fullname" . }}

charts/friendbot/values.yaml

@@ -36,7 +36,7 @@ friendbot:
       - /secret/secret.conf
       replicaCount: 1
       startupProbe:
-        tcpSocketPort: 8004
+        tcpSocket: {}
         initialDelaySeconds: 60
         failureThreshold: 60
         periodSeconds: 10
@@ -48,14 +48,9 @@ friendbot:
     #   environment: "dev"
     #   mylabel1: "myvalue1"
 
-  service:
-    port: 80
-    targetport: 8004
-
   ingress:
     host: "friendbot.example.com"
     # ingressClassName: ""
-    # port: 80
     # annotations:
     #   cert-manager.io/cluster-issuer: "default"