From 7c4f08c0e493ed371e5fc7cb1ea57f7454ae3bd5 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Mon, 8 Jul 2019 09:24:28 +0200
Subject: [PATCH] Promote RadosGW to non-WIP

---
 {charts-wip => charts}/radosgw/.helmignore                      | 0
 {charts-wip => charts}/radosgw/Chart.yaml                       | 0
 {charts-wip => charts}/radosgw/templates/NOTES.txt              | 0
 {charts-wip => charts}/radosgw/templates/_helpers.tpl           | 0
 {charts-wip => charts}/radosgw/templates/config.yaml            | 0
 {charts-wip => charts}/radosgw/templates/ingress.yaml           | 0
 {charts-wip => charts}/radosgw/templates/keyring.yaml           | 0
 {charts-wip => charts}/radosgw/templates/service.yaml           | 0
 {charts-wip => charts}/radosgw/templates/statefulset.yaml       | 2 +-
 .../radosgw/templates/tests/test-connection.yaml                | 0
 {charts-wip => charts}/radosgw/values.yaml                      | 0
 11 files changed, 1 insertion(+), 1 deletion(-)
 rename {charts-wip => charts}/radosgw/.helmignore (100%)
 rename {charts-wip => charts}/radosgw/Chart.yaml (100%)
 rename {charts-wip => charts}/radosgw/templates/NOTES.txt (100%)
 rename {charts-wip => charts}/radosgw/templates/_helpers.tpl (100%)
 rename {charts-wip => charts}/radosgw/templates/config.yaml (100%)
 rename {charts-wip => charts}/radosgw/templates/ingress.yaml (100%)
 rename {charts-wip => charts}/radosgw/templates/keyring.yaml (100%)
 rename {charts-wip => charts}/radosgw/templates/service.yaml (100%)
 rename {charts-wip => charts}/radosgw/templates/statefulset.yaml (97%)
 rename {charts-wip => charts}/radosgw/templates/tests/test-connection.yaml (100%)
 rename {charts-wip => charts}/radosgw/values.yaml (100%)

diff --git a/charts-wip/radosgw/.helmignore b/charts/radosgw/.helmignore
similarity index 100%
rename from charts-wip/radosgw/.helmignore
rename to charts/radosgw/.helmignore
diff --git a/charts-wip/radosgw/Chart.yaml b/charts/radosgw/Chart.yaml
similarity index 100%
rename from charts-wip/radosgw/Chart.yaml
rename to charts/radosgw/Chart.yaml
diff --git a/charts-wip/radosgw/templates/NOTES.txt b/charts/radosgw/templates/NOTES.txt
similarity index 100%
rename from charts-wip/radosgw/templates/NOTES.txt
rename to charts/radosgw/templates/NOTES.txt
diff --git a/charts-wip/radosgw/templates/_helpers.tpl b/charts/radosgw/templates/_helpers.tpl
similarity index 100%
rename from charts-wip/radosgw/templates/_helpers.tpl
rename to charts/radosgw/templates/_helpers.tpl
diff --git a/charts-wip/radosgw/templates/config.yaml b/charts/radosgw/templates/config.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/config.yaml
rename to charts/radosgw/templates/config.yaml
diff --git a/charts-wip/radosgw/templates/ingress.yaml b/charts/radosgw/templates/ingress.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/ingress.yaml
rename to charts/radosgw/templates/ingress.yaml
diff --git a/charts-wip/radosgw/templates/keyring.yaml b/charts/radosgw/templates/keyring.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/keyring.yaml
rename to charts/radosgw/templates/keyring.yaml
diff --git a/charts-wip/radosgw/templates/service.yaml b/charts/radosgw/templates/service.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/service.yaml
rename to charts/radosgw/templates/service.yaml
diff --git a/charts-wip/radosgw/templates/statefulset.yaml b/charts/radosgw/templates/statefulset.yaml
similarity index 97%
rename from charts-wip/radosgw/templates/statefulset.yaml
rename to charts/radosgw/templates/statefulset.yaml
index 274be68..4ab9a6e 100644
--- a/charts-wip/radosgw/templates/statefulset.yaml
+++ b/charts/radosgw/templates/statefulset.yaml
@@ -54,7 +54,7 @@ spec:
               name: ceph-keyring
               subPath: client.admin.keyring
               readOnly: true
-            - mountPath: /var/lib/ceph/bootstrap-rgw.keyring
+            - mountPath: /var/lib/ceph/bootstrap-rgw/ceph.keyring
               name: ceph-keyring
               subPath: bootstrap-rgw.keyring
               readOnly: true
diff --git a/charts-wip/radosgw/templates/tests/test-connection.yaml b/charts/radosgw/templates/tests/test-connection.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/tests/test-connection.yaml
rename to charts/radosgw/templates/tests/test-connection.yaml
diff --git a/charts-wip/radosgw/values.yaml b/charts/radosgw/values.yaml
similarity index 100%
rename from charts-wip/radosgw/values.yaml
rename to charts/radosgw/values.yaml