feat: configure ingress for samba service and add relevant labels to …

…service
4ALLPORTAL · Dec 17, 2024 · e66e494 · e66e494
1 parent 4932ae6
commit e66e494
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/charts/4allportal/Chart.yaml b/charts/4allportal/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.10.38"
 description: A Helm chart for 4ALLPORTAL version 3.10.0 and up
 name: 4allportal
-version: 20.1.1
+version: 20.1.2
 icon: https://4allportal.com/wp-content/uploads/2022/07/cropped-4ap_logo.png
 keywords:
   - 4ALLPORTAL

diff --git a/charts/4allportal/templates/4allportal/ingress.yaml b/charts/4allportal/templates/4allportal/ingress.yaml
@@ -29,6 +29,15 @@ spec:
             pathType: Prefix
             {{- end }}
 
+          {{- if .Values.samba.enabled }}
+          - path: "/smb"
+            backend:
+              name: {{ .Values.samba.service.prefix | default "portals" }}-samba-server.{{ .Values.samba.service.prefix | default "portals" }}
+              port:
+                name: ws
+            pathType: Prefix
+          {{- end }}
+
 {{- range $name, $ingress := .Values.fourAllPortal.ingress.additionalHosts }}
     - host: {{ required "You must provide a host, when enabling ingress" $ingress.host | quote }}
       http:

diff --git a/charts/4allportal/templates/samba/service.yaml b/charts/4allportal/templates/samba/service.yaml
@@ -4,6 +4,11 @@ kind: Service
 metadata:
   name: "{{ include "common.names.fullname" $ }}-samba"
   namespace: {{ .Release.Namespace }}
+  labels:
+    samba-service: enabled
+  {{- if .Values.fourAllPortal.ingress.enabled }}
+    hostname: {{ .Values.fourAllPortal.ingress.host }}
+  {{- end }}
 spec:
   ports:
     - name: smb