Skip to content

ceph csi #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpaks wants to merge 5 commits into
base: dkube-installer-2.1.6.3
Choose a base branch
from
Open

ceph csi #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcb86fb
csi
Sep 10, 2020
52db821
env
Sep 10, 2020
f1022c4
optional env
Sep 10, 2020
6ecca9b
Merge branch 'dkube-installer-2.1.5.1' of https://github.com/mak-454/…
Oct 7, 2020
3755b61
Merge branch 'dkube-installer-2.1.6.3' of https://github.com/oneconve…
dpaks Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions kustomize-nfs/dkube/base/dkube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ spec:
value: nfsServer
- name: NFS_BASE_PATH
value: nfsBasePath
- name: CEPH_MONITORS
value: 'cephMonitors'
- name: DKUBE_STORAGE_PROVIDER
valueFrom:
configMapKeyRef:
Expand All @@ -49,6 +47,10 @@ spec:
value: dkubeClusterType
- name: MODEL_REGISTRY
value: modelRegistry
envFrom:
- configMapRef:
name: ceph-config
optional: true
image: dkubeApiServerImage
imagePullPolicy: IfNotPresent
name: main
Expand Down Expand Up @@ -574,8 +576,6 @@ spec:
value: nfsBasePath
- name: DKUBE_APISERVER_ROLE
value: master
- name: CEPH_MONITORS
value: 'cephMonitors'
- name: DKUBE_STORAGE_PROVIDER
valueFrom:
configMapKeyRef:
Expand All @@ -585,6 +585,10 @@ spec:
value: dkubeClusterType
- name: MODEL_REGISTRY
value: modelRegistry
envFrom:
- configMapRef:
name: ceph-config
optional: true
image: dkubeApiServerImage
imagePullPolicy: IfNotPresent
name: main
Expand Down
68 changes: 24 additions & 44 deletions kustomize/dkube/base/dkube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ spec:
value: nfsServer
- name: NFS_BASE_PATH
value: nfsBasePath
- name: CEPH_MONITORS
value: 'cephMonitors'
- name: DKUBE_STORAGE_PROVIDER
valueFrom:
configMapKeyRef:
Expand All @@ -49,6 +47,10 @@ spec:
value: dkubeClusterType
- name: MODEL_REGISTRY
value: modelRegistry
envFrom:
- configMapRef:
name: ceph-config
optional: true
image: dkubeApiServerImage
imagePullPolicy: IfNotPresent
name: main
Expand All @@ -64,10 +66,12 @@ spec:
volumeMounts:
- mountPath: /home/dkube/d3s
name: store
subPath: dkube
- mountPath: /var/run/docker.sock
name: docker
- mountPath: /var/log/dkube
name: dkube-logs
subPath: dkube/system/logs/dkube
name: store
- mountPath: /etc/dkube/dkube_platform_cfg
name: pc
- image: dkubeDownloaderImage
Expand All @@ -89,19 +93,8 @@ spec:
serviceAccountName: dkube
volumes:
- name: store
cephfs:
monitors: cephMonitors
path: /dkube
user: admin
secretRef:
name: ceph-secret
- name: dkube-logs
cephfs:
monitors: cephMonitors
path: /dkube/system/logs/dkube
user: admin
secretRef:
name: ceph-secret
persistentVolumeClaim:
claimName: dkube-pvc
- hostPath:
path: /var/run/docker.sock
name: docker
Expand Down Expand Up @@ -270,6 +263,7 @@ spec:
volumeMounts:
- mountPath: /var/log/dkube
name: dkube-logs
subPath: dkube/system/logs/dkube
dnsPolicy: ClusterFirst
imagePullSecrets:
- name: dkubeDockerSecret
Expand All @@ -279,12 +273,8 @@ spec:
serviceAccountName: dkube
volumes:
- name: dkube-logs
cephfs:
monitors: cephMonitors
path: /dkube/system/logs/dkube
user: admin
secretRef:
name: ceph-secret
persistentVolumeClaim:
claimName: dkube-pvc
---
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -462,12 +452,8 @@ spec:
terminationGracePeriodSeconds: 30
volumes:
- name: storage
cephfs:
monitors: cephMonitors
path: /
user: admin
secretRef:
name: ceph-secret
persistentVolumeClaim:
claimName: dkube-pvc
---
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -568,6 +554,7 @@ spec:
volumeMounts:
- mountPath: /dkube
name: store
subPath: dkube
- env:
- name: DKUBE_MOUNT_PATH
value: /home/dkube/d3s
Expand All @@ -587,8 +574,6 @@ spec:
value: nfsBasePath
- name: DKUBE_APISERVER_ROLE
value: master
- name: CEPH_MONITORS
value: 'cephMonitors'
- name: DKUBE_STORAGE_PROVIDER
valueFrom:
configMapKeyRef:
Expand All @@ -598,6 +583,10 @@ spec:
value: dkubeClusterType
- name: MODEL_REGISTRY
value: modelRegistry
envFrom:
- configMapRef:
name: ceph-config
optional: true
image: dkubeApiServerImage
imagePullPolicy: IfNotPresent
name: main
Expand All @@ -613,10 +602,12 @@ spec:
volumeMounts:
- mountPath: /home/dkube/d3s
name: store
subPath: dkube
- mountPath: /var/run/docker.sock
name: docker
- mountPath: /var/log/dkube
name: dkube-logs
name: store
subPath: dkube/system/logs/dkube
- mountPath: /etc/dkube/dkube_platform_cfg
name: pc
dnsConfig:
Expand All @@ -633,19 +624,8 @@ spec:
serviceAccountName: dkube
volumes:
- name: store
cephfs:
monitors: cephMonitors
path: /dkube
user: admin
secretRef:
name: ceph-secret
- name: dkube-logs
cephfs:
monitors: cephMonitors
path: /dkube/system/logs/dkube
user: admin
secretRef:
name: ceph-secret
persistentVolumeClaim:
claimName: dkube-pvc
- hostPath:
path: /var/run/docker.sock
name: docker
Expand Down