From b9a6d02e10c9b7cad0efa54f6bf278ebf535b021 Mon Sep 17 00:00:00 2001
From: Ho Kim <ho.kim@ulagbulag.io>
Date: Mon, 10 Feb 2025 14:43:19 +0000
Subject: [PATCH] helm: add support for ingress path type

(cherry picked from commit 0ed667b806e5edd148fa4a073b11e82b472c9625)
---
 .../rook-ceph-cluster/templates/cephobjectstore-ingress.yaml    | 2 +-
 deploy/charts/rook-ceph-cluster/templates/ingress.yaml          | 2 +-
 deploy/charts/rook-ceph-cluster/values.yaml                     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml b/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml
index 6a1b82dde..bb0934124 100644
--- a/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml
+++ b/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: rook-ceph-rgw-{{ .name }}
                 port:
                   number: {{ .spec.gateway.securePort | default .spec.gateway.port }}
-            pathType: Prefix
+            pathType: {{ .ingress.host.pathType | default "Prefix" }}
 {{- else }}
               serviceName: rook-ceph-rgw-{{ .name }}
               servicePort: {{ .spec.gateway.securePort | default .spec.gateway.port }}
diff --git a/deploy/charts/rook-ceph-cluster/templates/ingress.yaml b/deploy/charts/rook-ceph-cluster/templates/ingress.yaml
index 883d8a48f..6d86c5f1d 100644
--- a/deploy/charts/rook-ceph-cluster/templates/ingress.yaml
+++ b/deploy/charts/rook-ceph-cluster/templates/ingress.yaml
@@ -24,7 +24,7 @@ spec:
                   {{- else }}
                   name: http-dashboard
                   {{- end }}
-            pathType: Prefix
+            pathType: {{ .Values.ingress.dashboard.host.pathType | default "Prefix" }}
 {{- else }}
               serviceName: rook-ceph-mgr-dashboard
               {{- if .Values.cephClusterSpec.dashboard.ssl }}
diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml
index 0259c0851..71db21001 100644
--- a/deploy/charts/rook-ceph-cluster/values.yaml
+++ b/deploy/charts/rook-ceph-cluster/values.yaml
@@ -431,6 +431,7 @@ ingress:
     # host:
     #   name: dashboard.example.com
     #   path: "/ceph-dashboard(/|$)(.*)"
+    #   pathType: Prefix
     # tls:
     # - hosts:
     #     - dashboard.example.com
@@ -634,6 +635,7 @@ cephObjectStores:
       # host:
       #   name: objectstore.example.com
       #   path: /
+      #   pathType: Prefix
       # tls:
       # - hosts:
       #     - objectstore.example.com