Fix TLS certificate

Signed-off-by: Alexandre Peixoto Ferreira <[email protected]>
smarter-project · Mar 24, 2023 · f7c09be · f7c09be
1 parent 5288805
commit f7c09be
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/charts/smarter-k3s-edge/Chart.yaml b/charts/smarter-k3s-edge/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: smarter-k3s-edge
-version: 0.0.8
+version: 0.0.9
 type: application
 appVersion: v1.25.3-k3s1
 description: K3s server on kubernetes

diff --git a/charts/smarter-k3s-edge/templates/k3s-edge-ingress.yaml b/charts/smarter-k3s-edge/templates/k3s-edge-ingress.yaml
@@ -15,11 +15,32 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: {{ .Values.application.appName }}
+            name: {{ .Values.application.appName }}-http
             port:
               number: {{ .Values.configuration.portHTTP }}
   tls:
     - secretName: {{ .Values.application.appName }}-tls
       hosts:
         - {{ .Values.configuration.host }}.{{ .Values.configuration.domain }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.application.appName }}-http
+  labels:
+    name: {{ .Values.application.appName }}
+spec:
+  selector:
+    name: {{ .Values.application.appName }}
+  ports:
+    {{- if .Values.configuration.portHTTP }}
+    - protocol: TCP
+      port: {{ .Values.configuration.portHTTP }}
+      name: {{ .Values.application.appName }}-http
+    {{- end }}
+    {{- if .Values.configuration.portHTTPS }}
+    - protocol: TCP
+      port: {{ .Values.configuration.portHTTPS }}
+      name: {{ .Values.application.appName }}-https
+    {{- end }}
 {{- end }}
diff --git a/charts/smarter-k3s-edge/templates/service.yaml b/charts/smarter-k3s-edge/templates/service.yaml
@@ -11,6 +11,7 @@ spec:
     - protocol: TCP
       port: {{ .Values.configuration.port }}
       name: {{ .Values.application.appName }}
+    {{- if not .Values.configuration.traefik }}
     {{- if .Values.configuration.portHTTP }}
     - protocol: TCP
       port: {{ .Values.configuration.portHTTP }}
@@ -21,5 +22,6 @@ spec:
       port: {{ .Values.configuration.portHTTPS }}
       name: {{ .Values.application.appName }}-https
     {{- end }}
+    {{- end }}
   externalIPs:
     - {{ .Values.configuration.hostIP }}