fix: ingress generation

Signed-off-by: Charlie Haley <[email protected]>
charlie-haley · Jan 11, 2024 · 6ec773a · 6ec773a
1 parent 25e6b09
commit 6ec773a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -56,8 +56,6 @@ spec:
           args:
             {{- toYaml .Values.args | nindent 12 }}
           {{- else }}
-          ### For debugging only - enable to allow exec into container
-          # command: ["/bin/sh","-c","sleep 300"]
           args:
             - "-c"
             - "/benthos.yaml"
@@ -111,11 +109,6 @@ spec:
               mountPath: "/benthos.yaml"
               subPath: "benthos.yaml"
               readOnly: true
-            {{- if and .Values.http.tls .Values.http.tls.enabled .Values.http.tls.secretName }}
-            - name: tls
-              mountPath: "/tls"
-              readOnly: true
-            {{- end }}
             {{- range .Values.extraVolumeMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
@@ -146,11 +139,6 @@ spec:
         - name: config
           configMap:
             name: {{ template "benthos.fullname" . }}-config
-        {{- if and .Values.http.tls .Values.http.tls.enabled .Values.http.tls.secretName }}
-        - name: tls
-          secret:
-            secretName: {{ .Values.http.tls.secretName }}
-        {{- end }}
         {{- if .Values.extraVolumes }}
           {{- toYaml .Values.extraVolumes | nindent 8 }}
         {{- end }}

diff --git a/templates/service.yaml b/templates/service.yaml
@@ -8,11 +8,13 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-  {{- range .Values.service.ports }}
-    -
-      {{- range $key, $val := . }}
-      {{ $key }}: {{ tpl (toString $val) $ }}
-      {{- end }}
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.targetPort }}
+      protocol: {{ .Values.service.protocol }}
+      name: {{ .Values.service.name }}
+
+  {{- with .Values.service.extraPorts }}
+    {{- toYaml .Values.args | nindent 4 }}
   {{- end }}
   selector:
     {{- include "benthos.selectorLabels" . | nindent 4 }}

diff --git a/values.yaml b/values.yaml
@@ -45,13 +45,13 @@ securityContext: {}
   # runAsUser: 1000
 
 service:
+  name: http
   type: ClusterIP
-  ports:
-    # Override this as 443 when .Values.http.tls.enabled is true
-    - name: http
-      port: 80
-      targetPort: http
-      protocol: TCP
+  port: 80
+  targetPort: http
+  protocol: TCP
+
+  extraPorts:
     # - name: extraPort
     #   port: 9999
     #   targetPort: 9999