openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "CephFs-provisioner: fix cephfs storageclass"

Browse Source
This commit is contained in:
Zuul 2019-05-23 22:02:58 +00:00 committed by Gerrit Code Review
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: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: PVC_CEPH_CEPHFS_STORAGECLASS_USER_SECRET_NAME - 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 }} 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 - name: PVC_CEPH_CEPHFS_STORAGECLASS_DEPLOYED_NAMESPACE
value: {{ .Values.storageclass.cephfs.parameters.adminSecretNamespace }} value: {{ .Values.storageclass.cephfs.parameters.adminSecretNamespace }}
command: command:

4
ceph-provisioners/values.yaml
View File

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

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

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