Commit 0b15b613 by wangtingwei

core collector增加挂载kubelet.sock,废弃core monitor,二者不兼容

1 parent 6d7ed887
...@@ -30,6 +30,9 @@ spec: ...@@ -30,6 +30,9 @@ spec:
- name: config - name: config
mountPath: /adl/bin/conf/app.yaml mountPath: /adl/bin/conf/app.yaml
subPath: app.yaml subPath: app.yaml
- name: k8s-pod-resource-sock
mountPath: /var/lib/kubelet/pod-resources/kubelet.sock
subPath: kubelet.sock
command: ["core--collector"] command: ["core--collector"]
ports: ports:
- containerPort: 8080 - containerPort: 8080
...@@ -54,6 +57,9 @@ spec: ...@@ -54,6 +57,9 @@ spec:
- name: docker-sock - name: docker-sock
hostPath: hostPath:
path: /var/run/ path: /var/run/
- name: k8s-pod-resource-sock
hostPath:
path: /var/lib/kubelet/pod-resources
- name: hostname - name: hostname
hostPath: hostPath:
path: /etc/hostname path: /etc/hostname
......
...@@ -12,54 +12,11 @@ spec: ...@@ -12,54 +12,11 @@ spec:
logCollect: "true" logCollect: "true"
spec: spec:
imagePullSecrets: imagePullSecrets:
- name: "harbor-secret" - name: "harbor-secret"
serviceAccountName: autodl-serviceaccount serviceAccountName: autodl-serviceaccount
nodeSelector: nodeSelector:
internal_service_node: "true" internal_service_node: "true"
containers: containers:
- name: core--monitor - name: core--monitor
image: DOCKER_REGISTRY/adl-core-v1:latest image: DOCKER_REGISTRY/adl-core-v1:latest
imagePullPolicy: Always 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
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!