lujiaming 1 год назад
Родитель
Сommit
c703d01e9d
1 измененных файлов с 6 добавлено и 39 удалено
  1. 6 39
      ob-server/deployment.yaml

+ 6 - 39
ob-server/deployment.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -16,9 +15,10 @@ spec:
       labels:
         app.kubernetes.io/name: ob-server
     spec:
+      nodeName: k8sm1
       containers:
-        - name: nginx
-          image: reg.cestong.com.cn/cecf/observe-server 
+        - name: observe-server
+          image: reg.cestong.com.cn/cecf/observe-server
           imagePullPolicy: Always
           ports:
             - name: web
@@ -38,43 +38,10 @@ spec:
           - name: cm-settings
             mountPath: /app/settings.yml
             subPath: settings.yaml
-      volumes:
-      - name: cm-settings
-        configMap:
-          name: ob-server-settings
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ob-server-consumer-trace-url
-  namespace: observe
-  labels:
-    app.kubernetes.io/name: ob-server-consumer-trace-url
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: ob-server-consumer-trace-url
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: ob-server-consumer-trace-url
-    spec:
-      containers:
-        - name: nginx
-          image: reg.cestong.com.cn/cecf/observe-server 
+        - name: observe-consumer
+          image: reg.cestong.com.cn/cecf/observe-server
           command: ["/app/observe","consumer", "traceurl","-c", "/app/settings.yml"]
           imagePullPolicy: Always
-          ports:
-            - name: web
-              containerPort: 8000
-              protocol: TCP
-          securityContext:
-            allowPrivilegeEscalation: false
-              #runAsGroup: ''
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"
           volumeMounts:
           - name: cm-settings
             mountPath: /app/settings.yml
@@ -82,4 +49,4 @@ spec:
       volumes:
       - name: cm-settings
         configMap:
-          name: ob-server-settings
+          name: ob-server-settings