From dcb86fbff33da35e93cbda7ab0df69f9b244843e Mon Sep 17 00:00:00 2001 From: Deepak S Date: Thu, 10 Sep 2020 08:19:50 +0000 Subject: [PATCH 1/3] csi --- kustomize-nfs/dkube/base/dkube.yaml | 4 -- kustomize/dkube/base/dkube.yaml | 60 ++++++++--------------------- 2 files changed, 16 insertions(+), 48 deletions(-) diff --git a/kustomize-nfs/dkube/base/dkube.yaml b/kustomize-nfs/dkube/base/dkube.yaml index 2a210a9..d6297c0 100644 --- a/kustomize-nfs/dkube/base/dkube.yaml +++ b/kustomize-nfs/dkube/base/dkube.yaml @@ -36,8 +36,6 @@ spec: value: nfsServer - name: NFS_BASE_PATH value: nfsBasePath - - name: CEPH_MONITORS - value: 'cephMonitors' - name: DKUBE_STORAGE_PROVIDER valueFrom: configMapKeyRef: @@ -589,8 +587,6 @@ spec: value: nfsBasePath - name: DKUBE_APISERVER_ROLE value: master - - name: CEPH_MONITORS - value: 'cephMonitors' - name: DKUBE_STORAGE_PROVIDER valueFrom: configMapKeyRef: diff --git a/kustomize/dkube/base/dkube.yaml b/kustomize/dkube/base/dkube.yaml index 86776a5..c343849 100644 --- a/kustomize/dkube/base/dkube.yaml +++ b/kustomize/dkube/base/dkube.yaml @@ -36,8 +36,6 @@ spec: value: nfsServer - name: NFS_BASE_PATH value: nfsBasePath - - name: CEPH_MONITORS - value: 'cephMonitors' - name: DKUBE_STORAGE_PROVIDER valueFrom: configMapKeyRef: @@ -64,10 +62,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 @@ -89,19 +89,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 @@ -289,6 +278,7 @@ spec: volumeMounts: - mountPath: /var/log/dkube name: dkube-logs + subPath: dkube/system/logs/dkube dnsPolicy: ClusterFirst imagePullSecrets: - name: dkubeDockerSecret @@ -298,12 +288,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 @@ -481,12 +467,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 @@ -583,6 +565,7 @@ spec: volumeMounts: - mountPath: /dkube name: store + subPath: dkube - env: - name: DKUBE_MOUNT_PATH value: /home/dkube/d3s @@ -602,8 +585,6 @@ spec: value: nfsBasePath - name: DKUBE_APISERVER_ROLE value: master - - name: CEPH_MONITORS - value: 'cephMonitors' - name: DKUBE_STORAGE_PROVIDER valueFrom: configMapKeyRef: @@ -628,10 +609,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: @@ -648,19 +631,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 From 52db82101bbf554b041961ce75fabcc69a2cf4e2 Mon Sep 17 00:00:00 2001 From: Deepak S Date: Thu, 10 Sep 2020 18:31:36 +0000 Subject: [PATCH 2/3] env --- kustomize-nfs/dkube/base/dkube.yaml | 6 ++++++ kustomize/dkube/base/dkube.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/kustomize-nfs/dkube/base/dkube.yaml b/kustomize-nfs/dkube/base/dkube.yaml index d6297c0..c07ee66 100644 --- a/kustomize-nfs/dkube/base/dkube.yaml +++ b/kustomize-nfs/dkube/base/dkube.yaml @@ -47,6 +47,9 @@ spec: value: dkubeClusterType - name: MODEL_REGISTRY value: modelRegistry + envFrom: + - configMapRef: + name: ceph-config image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main @@ -596,6 +599,9 @@ spec: value: dkubeClusterType - name: MODEL_REGISTRY value: modelRegistry + envFrom: + - configMapRef: + name: ceph-config image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main diff --git a/kustomize/dkube/base/dkube.yaml b/kustomize/dkube/base/dkube.yaml index c343849..a257336 100644 --- a/kustomize/dkube/base/dkube.yaml +++ b/kustomize/dkube/base/dkube.yaml @@ -47,6 +47,9 @@ spec: value: dkubeClusterType - name: MODEL_REGISTRY value: modelRegistry + envFrom: + - configMapRef: + name: ceph-config image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main @@ -594,6 +597,9 @@ spec: value: dkubeClusterType - name: MODEL_REGISTRY value: modelRegistry + envFrom: + - configMapRef: + name: ceph-config image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main From f1022c4de3a99dbac53cbce984abce1b39d7f1c5 Mon Sep 17 00:00:00 2001 From: Deepak S Date: Thu, 10 Sep 2020 18:44:25 +0000 Subject: [PATCH 3/3] optional env --- kustomize-nfs/dkube/base/dkube.yaml | 2 ++ kustomize/dkube/base/dkube.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kustomize-nfs/dkube/base/dkube.yaml b/kustomize-nfs/dkube/base/dkube.yaml index c07ee66..6c7abe1 100644 --- a/kustomize-nfs/dkube/base/dkube.yaml +++ b/kustomize-nfs/dkube/base/dkube.yaml @@ -50,6 +50,7 @@ spec: envFrom: - configMapRef: name: ceph-config + optional: true image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main @@ -602,6 +603,7 @@ spec: envFrom: - configMapRef: name: ceph-config + optional: true image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main diff --git a/kustomize/dkube/base/dkube.yaml b/kustomize/dkube/base/dkube.yaml index a257336..63f07a7 100644 --- a/kustomize/dkube/base/dkube.yaml +++ b/kustomize/dkube/base/dkube.yaml @@ -50,6 +50,7 @@ spec: envFrom: - configMapRef: name: ceph-config + optional: true image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main @@ -600,6 +601,7 @@ spec: envFrom: - configMapRef: name: ceph-config + optional: true image: dkubeApiServerImage imagePullPolicy: IfNotPresent name: main