From fa35a08d073ca159d7730f79c36fea21434a23bc Mon Sep 17 00:00:00 2001
From: Rohan Agarwal <rohanag12@gmail.com>
Date: Tue, 22 Oct 2024 09:52:53 -0700
Subject: [PATCH] feat(ingress): make ingress pathType configurable (#513)

k8s supports different values for `pathType` for ingresses, as [documented here](https://kubernetes.io/docs/concepts/services-networking/ingress/#path-types).
Make the ingress pathType configurable for the gms and frontend charts so that users can set different values based on their ingress deployment strategy.
---
 charts/datahub/Chart.yaml                                    | 2 +-
 .../subcharts/datahub-frontend/templates/ingress.yaml        | 5 +++--
 charts/datahub/subcharts/datahub-frontend/values.yaml        | 1 +
 charts/datahub/subcharts/datahub-gms/templates/ingress.yaml  | 5 +++--
 charts/datahub/subcharts/datahub-gms/values.yaml             | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml
index eea9f669f..f2edb2a78 100644
--- a/charts/datahub/Chart.yaml
+++ b/charts/datahub/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for DataHub
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.4.31
+version: 0.4.32
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.14.1
diff --git a/charts/datahub/subcharts/datahub-frontend/templates/ingress.yaml b/charts/datahub/subcharts/datahub-frontend/templates/ingress.yaml
index 845e45c88..0ea9425f7 100644
--- a/charts/datahub/subcharts/datahub-frontend/templates/ingress.yaml
+++ b/charts/datahub/subcharts/datahub-frontend/templates/ingress.yaml
@@ -2,6 +2,7 @@
 {{- $fullName := include "datahub-frontend.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 {{- $ingressApiVersion := include "datahub-frontend.ingress.apiVersion" . -}}
+{{- $ingressPathType := .Values.ingress.pathType -}}
 apiVersion: {{ template "datahub-frontend.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
@@ -37,7 +38,7 @@ spec:
         {{- range .redirectPaths }}
           - path: {{ .path }}
             {{- if eq $ingressApiVersion "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
+            pathType: {{ $ingressPathType }}
             backend:
               service:
                 name: {{ .name }}
@@ -56,7 +57,7 @@ spec:
         {{- range .paths }}
           - path: {{ . }}
             {{- if eq $ingressApiVersion "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
+            pathType: {{ $ingressPathType }}
             backend:
               service:
                 name: {{ $fullName }}
diff --git a/charts/datahub/subcharts/datahub-frontend/values.yaml b/charts/datahub/subcharts/datahub-frontend/values.yaml
index 3a7d65251..9ceed7634 100644
--- a/charts/datahub/subcharts/datahub-frontend/values.yaml
+++ b/charts/datahub/subcharts/datahub-frontend/values.yaml
@@ -78,6 +78,7 @@ ingress:
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
+  pathType: ImplementationSpecific
 
 auth:
   sessionTTLHours: "24"
diff --git a/charts/datahub/subcharts/datahub-gms/templates/ingress.yaml b/charts/datahub/subcharts/datahub-gms/templates/ingress.yaml
index 4f82e05a1..633cb3675 100644
--- a/charts/datahub/subcharts/datahub-gms/templates/ingress.yaml
+++ b/charts/datahub/subcharts/datahub-gms/templates/ingress.yaml
@@ -2,6 +2,7 @@
 {{- $fullName := printf "%s-%s" .Release.Name "datahub-gms"}}
 {{- $svcPort := .Values.global.datahub.gms.port -}}
 {{- $ingressApiVersion := include "datahub-gms.ingress.apiVersion" . -}}
+{{- $ingressPathType := .Values.ingress.pathType -}}
 apiVersion: {{ template "datahub-gms.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
@@ -37,7 +38,7 @@ spec:
         {{- range .redirectPaths }}
           - path: {{ .path }}
             {{- if eq $ingressApiVersion "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
+            pathType: {{ $ingressPathType }}
             backend:
               service:
                 name: {{ .name }}
@@ -56,7 +57,7 @@ spec:
         {{- range .paths }}
           - path: {{ . }}
             {{- if eq $ingressApiVersion "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
+            pathType: {{ $ingressPathType }}
             backend:
               service:
                 name: {{ $fullName }}
diff --git a/charts/datahub/subcharts/datahub-gms/values.yaml b/charts/datahub/subcharts/datahub-gms/values.yaml
index fcfb9e93b..42fbf84b5 100644
--- a/charts/datahub/subcharts/datahub-gms/values.yaml
+++ b/charts/datahub/subcharts/datahub-gms/values.yaml
@@ -76,6 +76,7 @@ ingress:
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
+  pathType: ImplementationSpecific
 
 # Extra labels for Deployment
 extraLabels: {}