Merge pull request #210 from erwan-b/main

feat: Being able to edit ingress `servicePort` in `values.yaml`
flipt-io · Feb 12, 2025 · c21443c · c21443c
2 parents 4728712 + b70d871
commit c21443c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/charts/flipt/Chart.yaml b/charts/flipt/Chart.yaml
@@ -3,7 +3,7 @@ name: flipt
 home: https://flipt.io
 description: Flipt is an open-source, self-hosted feature flag solution.
 type: application
-version: 0.80.0
+version: 0.80.1
 appVersion: v1.55.0
 maintainers:
   - name: Flipt

diff --git a/charts/flipt/templates/ingress.yaml b/charts/flipt/templates/ingress.yaml
@@ -1,6 +1,5 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "flipt.fullname" . -}}
-{{- $svcPort := default .Values.service.httpPort .Values.service.httpsPort -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
@@ -50,12 +49,12 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}
+                name: {{ default $fullName .backend.serviceName }}
                 port:
-                  number: {{ $svcPort }}
+                  name: {{  .backend.servicePort }}
               {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              serviceName: {{ default $fullName .backend.serviceName }}
+              servicePort: {{ .backend.servicePort }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/charts/flipt/values.yaml b/charts/flipt/values.yaml
@@ -85,6 +85,9 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
+          backend:
+            servicePort: http
+            serviceName: ""
   tls: []
   #  - secretName: chart-example-tls
   #    hosts: