From 514ee798b7d149361cf8d3f34f075ea2beedac29 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 7 Apr 2025 16:38:54 -0600 Subject: [PATCH] helm: allow specifying an ingress object store port to override default The default object store ingress port will be set to the securePort (if set), or the gateway port field. To override that default, a new port field can be set on the ingress. Signed-off-by: Travis Nielsen (cherry picked from commit 5ad38cb57982c8e81507bcf9571e5b68ea76cded) --- .../rook-ceph-cluster/templates/cephobjectstore-ingress.yaml | 2 +- deploy/charts/rook-ceph-cluster/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml b/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml index c86ed9ba3..693c2ce16 100644 --- a/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml +++ b/deploy/charts/rook-ceph-cluster/templates/cephobjectstore-ingress.yaml @@ -19,7 +19,7 @@ spec: service: name: rook-ceph-rgw-{{ .name }} port: - number: {{ .spec.gateway.securePort | default .spec.gateway.port }} + number: {{ .ingress.port | default .spec.gateway.securePort | default .spec.gateway.port }} pathType: {{ .ingress.host.pathType | default "Prefix" }} {{- with .ingress.ingressClassName }} ingressClassName: {{ . }} diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index 865dea147..02d9e77a0 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -627,6 +627,9 @@ cephObjectStores: ingress: # Enable an ingress for the ceph-objectstore enabled: false + # The ingress port by default will be the object store's "securePort" (if set), or the gateway "port". + # To override those defaults, set this ingress port to the desired port. + # port: 80 # annotations: {} # host: # name: objectstore.example.com