openstack
/
openstack-helm-infra
Code Issues Proposed changes

Merge "CephFs-provisioner: fix cephfs storageclass"

This commit is contained in:
Zuul 2019-05-23 22:02:58 +00:00 committed by Gerrit Code Review
parent 66f62aff40 53bdbf00ed
commit 038a6e58ae
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph-provisioners/templates/job-cephfs-client-key.yaml
View File

@ -108,9 +108,9 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: PVC_CEPH_CEPHFS_STORAGECLASS_USER_SECRET_NAME
value: {{ .Values.storageclass.cephfs.parameters.userSecretName }}
- name: PVC_CEPH_CEPHFS_STORAGECLASS_ADMIN_SECRET_NAME
value: {{ .Values.storageclass.cephfs.parameters.adminSecretName }}
- name: PVC_CEPH_CEPHFS_STORAGECLASS_ADMIN_SECRET_NAME
value: {{ .Values.secrets.keyrings.prov_adminSecretName }}
- name: PVC_CEPH_CEPHFS_STORAGECLASS_DEPLOYED_NAMESPACE
value: {{ .Values.storageclass.cephfs.parameters.adminSecretNamespace }}
command:

4
ceph-provisioners/values.yaml
View File

@ -135,6 +135,7 @@ pod:
secrets:
keyrings:
admin: ceph-client-admin-keyring
prov_adminSecretName: pvc-ceph-conf-combined-storageclass
network:
public: 192.168.0.0/16
@ -238,8 +239,7 @@ storageclass:
name: cephfs
parameters:
adminId: admin
userSecretName: pvc-ceph-cephfs-client-key
adminSecretName: pvc-ceph-conf-combined-storageclass
adminSecretName: pvc-ceph-cephfs-client-key
adminSecretNamespace: ceph
endpoints:

7
helm-toolkit/templates/manifests/_ceph-storageclass.tpl
View File

@ -46,8 +46,7 @@ examples:
name: cephfs
parameters:
admin_id: admin
user_secret_name: "pvc-ceph-cephfs-client-key"
admin_secret_name: "pvc-ceph-conf-combined-storageclass"
admin_secret_name: "pvc-ceph-cephfs-client-key"
admin_secret_namespace: ceph
usage: |
{{- range $storageclass, $val := .Values.storageclass }}
@ -77,11 +76,11 @@ examples:
kind: StorageClass
metadata:
name: cephfs
provisioner: ceph.com/rbd
provisioner: ceph.com/cephfs
parameters:
monitors: ceph-mon.<ceph-namespace>.svc.<k8s-domain-name>:6789
adminId: admin
adminSecretName: pvc-ceph-conf-combined-storageclass
adminSecretName: pvc-ceph-cephfs-client-key
adminSecretNamespace: ceph
*/}}