From 207da4426a8ffa8169889d4c531bc581580eb4b3 Mon Sep 17 00:00:00 2001
From: "Ritchie, Frank (fr801x)" <fr801x@att.com>
Date: Tue, 13 Apr 2021 16:02:38 -0400
Subject: [PATCH] Update tls overrides

Updated tls overrides for proper gate functionality.

Change-Id: I59d9e0425b41a5121fc0a6d0d75b7f6e3d54bec6
---
 ceph-rgw/Chart.yaml                |  2 +-
 ceph-rgw/values_overrides/tls.yaml | 27 +++++++++++++++++++++++++--
 releasenotes/notes/ceph-rgw.yaml   |  1 +
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml
index b91b3d27d..7eeb44459 100644
--- a/ceph-rgw/Chart.yaml
+++ b/ceph-rgw/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 0.1.5
+version: 0.1.6
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-rgw/values_overrides/tls.yaml b/ceph-rgw/values_overrides/tls.yaml
index cf02f8842..6f708d3d3 100644
--- a/ceph-rgw/values_overrides/tls.yaml
+++ b/ceph-rgw/values_overrides/tls.yaml
@@ -1,22 +1,45 @@
 ---
 endpoints:
   object_store:
+    scheme:
+      default: https
     host_fqdn_override:
       default:
         tls:
           secretName: ceph-rgw-ks-tls-api
           issuerRef:
-            name: ca-clusterissuer
+            name: ca-issuer
             kind: ClusterIssuer
   ceph_object_store:
+    scheme:
+      default: https
     host_fqdn_override:
       default:
         tls:
           secretName: ceph-rgw-s3-tls-api
           issuerRef:
-            name: ca-clusterissuer
+            name: ca-issuer
             kind: ClusterIssuer
 
+network:
+  api:
+    ingress:
+      public: true
+      classes:
+        namespace: "nginx"
+        cluster: "nginx-cluster"
+      annotations:
+        nginx.ingress.kubernetes.io/rewrite-target: /
+        nginx.ingress.kubernetes.io/proxy-body-size: "0"
+        nginx.ingress.kubernetes.io/proxy-max-temp-file-size: "0"
+        nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+      external_policy_local: false
+      node_port:
+        enabled: false
+        port: 30004
+    public: 192.168.0.0/16
+    cluster: 192.168.0.0/16
+
 manifests:
   certificates: true
 ...
diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml
index fdf5764aa..8ef72df3e 100644
--- a/releasenotes/notes/ceph-rgw.yaml
+++ b/releasenotes/notes/ceph-rgw.yaml
@@ -6,4 +6,5 @@ ceph-rgw:
   - 0.1.3 update rbac api version
   - 0.1.4 Rgw placement target support
   - 0.1.5 Add tls support
+  - 0.1.6 Update tls override options
 ...