增加nfs多实例

kpl_deploy_yaml/1-autodl-core/collector-deployment.yaml

@@ -20,8 +20,12 @@ spec:
         image: DOCKER_REGISTRY/core--collector:latest
         imagePullPolicy: Always
         volumeMounts:
-        - mountPath: /mnt/ceph
+        - mountPath: /mnt/adl-pvc
           name: adl-volume
+        - mountPath: /mnt/adl-pvc2
+          name: adl-volume2
+        - mountPath: /mnt/adl-pvc3
+          name: adl-volume3
         - name: docker-sock
           mountPath: /var/run/docker.sock
           subPath: docker.sock
@@ -30,6 +34,9 @@ spec:
         - name: config
           mountPath: /adl/bin/conf/app.yaml
           subPath: app.yaml
+        - name: k8s-pod-resource-sock
+          mountPath: /var/lib/kubelet/pod-resources/kubelet.sock
+          subPath: kubelet.sock
         command: ["core--collector"]
         ports:
           - containerPort: 8080
@@ -51,9 +58,20 @@ spec:
         persistentVolumeClaim:
           claimName: adl-pvc
           readOnly: false
+      - name: adl-volume2
+        persistentVolumeClaim:
+          claimName: adl-pvc2
+          readOnly: false
+      - name: adl-volume3
+        persistentVolumeClaim:
+          claimName: adl-pvc3
+          readOnly: false
       - name: docker-sock
         hostPath:
           path: /var/run/
+      - name: k8s-pod-resource-sock
+        hostPath:
+          path: /data/kubelet/pod-resources
       - name: hostname
         hostPath:
           path: /etc/hostname

kpl_deploy_yaml/1-autodl-core/monitor-deployment.yaml

-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: core--monitor
-  namespace: autodl
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: core--monitor
-        logCollect: "true"
-    spec:
-      imagePullSecrets:
-      - name: "harbor-secret"
-      serviceAccountName: autodl-serviceaccount
-      nodeSelector:
-        internal_service_node: "true"
-      containers:
-      - name: core--monitor
-        image: DOCKER_REGISTRY/adl-core-v1:latest
-        imagePullPolicy: Always
-        volumeMounts:
-        - mountPath: /mnt/ceph
-          name: adl-volume
-        - name: docker-sock
-          mountPath: /var/run/docker.sock
-          subPath: docker.sock
-        - name: config
-          mountPath: /adl/bin/conf/app.yaml
-          subPath: app.yaml
-        - mountPath: /etc/kpl/ssl
-          name: kpl-ssl
-          readOnly: true
-        command: ["core--monitor"]
-        ports:
-          - containerPort: 8080
-            name: cmport-8080
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: cmport-8080
-            scheme: HTTP
-        resources:
-          requests:
-            cpu: "200m"
-            memory: "512Mi"
-          limits:
-            cpu: "1000m"
-            memory: "1024Mi"
-      volumes:
-      - name: adl-volume
-        persistentVolumeClaim:
-          claimName: adl-pvc
-          readOnly: false
-      - configMap:
-          defaultMode: 420
-          name: kpl-ssl
-        name: kpl-ssl
-      - name: docker-sock
-        hostPath:
-          path: /var/run/
-      - name: config
-        configMap:
-          name: cfg-autodl-core

kpl_deploy_yaml/1-autodl-core/server-deployment.yaml

@@ -21,8 +21,12 @@ spec:
         image: DOCKER_REGISTRY/adl-core-v1:latest
         imagePullPolicy: Always
         volumeMounts:
-        - mountPath: /mnt/ceph
+        - mountPath: /mnt/adl-pvc
           name: adl-volume
+        - mountPath: /mnt/adl-pvc2
+          name: adl-volume2
+        - mountPath: /mnt/adl-pvc3
+          name: adl-volume3
         - name: docker-sock
           mountPath: /var/run/docker.sock
           subPath: docker.sock
@@ -48,6 +52,14 @@ spec:
         persistentVolumeClaim:
           claimName: adl-pvc
           readOnly: false
+      - name: adl-volume2
+        persistentVolumeClaim:
+          claimName: adl-pvc2
+          readOnly: false
+      - name: adl-volume3
+        persistentVolumeClaim:
+          claimName: adl-pvc3
+          readOnly: false
       - name: docker-sock
         hostPath:
           path: /var/run/

kpl_deploy_yaml/1-autodl-core/worker-deployment.yaml

@@ -21,8 +21,12 @@ spec:
         image: DOCKER_REGISTRY/adl-core-v1:latest
         imagePullPolicy: Always
         volumeMounts:
-        - mountPath: /mnt/ceph
+        - mountPath: /mnt/adl-pvc
           name: adl-volume
+        - mountPath: /mnt/adl-pvc2
+          name: adl-volume2
+        - mountPath: /mnt/adl-pvc3
+          name: adl-volume3
         - name: docker-sock
           mountPath: /var/run/docker.sock
           subPath: docker.sock
@@ -55,6 +59,14 @@ spec:
         persistentVolumeClaim:
           claimName: adl-pvc
           readOnly: false
+      - name: adl-volume2
+        persistentVolumeClaim:
+          claimName: adl-pvc2
+          readOnly: false
+      - name: adl-volume3
+        persistentVolumeClaim:
+          claimName: adl-pvc3
+          readOnly: false
       - name: docker-sock
         hostPath:
           path: /var/run/

kpl_deploy_yaml/3-kpl-backend/monitor-deployment.yaml

@@ -22,11 +22,6 @@ spec:
         image: DOCKER_REGISTRY/kpl-backend-v1:latest
         imagePullPolicy: Always
         volumeMounts:
-        - mountPath: /mnt/ceph
-          name: kpl-volume
-        - name: docker-sock
-          mountPath: /var/run/docker.sock
-          subPath: docker.sock
         - mountPath: /data/kpl-log
           name: kpl-log
         - name: config
@@ -50,13 +45,6 @@ spec:
             cpu: "1000m"
             memory: "1024Mi"
       volumes:
-      - name: kpl-volume
-        persistentVolumeClaim:
-          claimName: kpl-pvc
-          readOnly: false
-      - name: docker-sock
-        hostPath:
-          path: /var/run/
       - name: kpl-log
         hostPath:
           path: /data/kpl-log

kpl_deploy_yaml/3-kpl-backend/server-deployment.yaml

@@ -21,8 +21,12 @@ spec:
         image: DOCKER_REGISTRY/kpl-backend-v1:latest
         imagePullPolicy: Always
         volumeMounts:
-        - mountPath: /mnt/ceph
+        - mountPath: /mnt/kpl-pvc
           name: kpl-volume
+        - mountPath: /mnt/kpl-pvc2
+          name: kpl-volume2
+        - mountPath: /mnt/kpl-pvc3
+          name: kpl-volume3
         - name: docker-sock
           mountPath: /var/run/docker.sock
           subPath: docker.sock
@@ -53,6 +57,14 @@ spec:
         persistentVolumeClaim:
           claimName: kpl-pvc
           readOnly: false
+      - name: kpl-volume2
+        persistentVolumeClaim:
+          claimName: kpl-pvc2
+          readOnly: false
+      - name: kpl-volume3
+        persistentVolumeClaim:
+          claimName: kpl-pvc3
+          readOnly: false
       - name: kpl-log
         hostPath:
             path: /data/kpl-log

kpl_deploy_yaml/3-kpl-backend/worker-deployment.yaml

@@ -21,11 +21,12 @@ spec:
         image: DOCKER_REGISTRY/kpl-backend-v1:latest
         imagePullPolicy: Always
         volumeMounts:
-        - mountPath: /mnt/ceph
+        - mountPath: /mnt/kpl-pvc
           name: kpl-volume
-        - name: docker-sock
-          mountPath: /var/run/docker.sock
-          subPath: docker.sock
+        - mountPath: /mnt/kpl-pvc2
+          name: kpl-volume2
+        - mountPath: /mnt/kpl-pvc3
+          name: kpl-volume3
         - mountPath: /data/kpl-log
           name: kpl-log
         - name: config
@@ -54,9 +55,14 @@ spec:
         persistentVolumeClaim:
           claimName: kpl-pvc
           readOnly: false
-      - name: docker-sock
-        hostPath:
-          path: /var/run/
+      - name: kpl-volume2
+        persistentVolumeClaim:
+          claimName: kpl-pvc2
+          readOnly: false
+      - name: kpl-volume3
+        persistentVolumeClaim:
+          claimName: kpl-pvc3
+          readOnly: false
       - name: kpl-log
         hostPath:
           path: /data/kpl-log