From d755ebcd0e52b61ee94c2c9a9f2ac39731ac7297 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Tue, 31 Mar 2020 16:39:17 +0200
Subject: [PATCH] radosgw: Proper fix for frontend port selection

---
 charts/radosgw/Chart.yaml                 | 2 +-
 charts/radosgw/templates/config.yaml      | 5 +++--
 charts/radosgw/templates/statefulset.yaml | 3 ++-
 charts/radosgw/values.yaml                | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/charts/radosgw/Chart.yaml b/charts/radosgw/Chart.yaml
index 20b83fa..75b0271 100644
--- a/charts/radosgw/Chart.yaml
+++ b/charts/radosgw/Chart.yaml
@@ -4,4 +4,4 @@ appVersion: "14.2"
 description: CEPH RadosGW
 icon: http://ceph.com/wp-content/uploads/2016/07/Ceph_Logo_Stacked_RGB_120411_fa.png
 name: radosgw
-version: 0.3.3
+version: 0.3.4
diff --git a/charts/radosgw/templates/config.yaml b/charts/radosgw/templates/config.yaml
index 3cf4ec7..2837431 100644
--- a/charts/radosgw/templates/config.yaml
+++ b/charts/radosgw/templates/config.yaml
@@ -1,3 +1,4 @@
+{{- $port := .Values.frontendPort | default 8008 -}}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -11,9 +12,9 @@ data:
     mon_host = {{ include "helm-toolkit.utils.joinListWithComma" .Values.monHosts }}
     rgw dns name = {{ .Values.dnsName }}
 {{- if eq .Values.frontend "beast" }}
-    rgw frontends = beast port=80 endpoint=0.0.0.0
+    rgw frontends = beast endpoint=0.0.0.0 port={{ $port }}
 {{- else if eq .Values.frontend "civetweb" }}
-    rgw frontends = civetweb port=80
+    rgw frontends = civetweb port={{ $port }}
 {{- end }}
 {{- if .Values.extraCephConf }}
 
diff --git a/charts/radosgw/templates/statefulset.yaml b/charts/radosgw/templates/statefulset.yaml
index 61b5efd..b4bd353 100644
--- a/charts/radosgw/templates/statefulset.yaml
+++ b/charts/radosgw/templates/statefulset.yaml
@@ -1,3 +1,4 @@
+{{- $port := .Values.frontendPort | default 8008 -}}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -35,7 +36,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: {{ $port }}
               protocol: TCP
           livenessProbe:
             httpGet:
diff --git a/charts/radosgw/values.yaml b/charts/radosgw/values.yaml
index 7287b28..d6d111b 100644
--- a/charts/radosgw/values.yaml
+++ b/charts/radosgw/values.yaml
@@ -19,6 +19,7 @@ dnsName: chart-example.local
 
 # The RadosGW frontend to use, either beast or civetweb
 frontend: beast
+# frontendPort: 8008
 
 # extraCephConf: |-