Browse Source

调整k8s的yaml格式错误

lijie 3 years ago
parent
commit
a86637bf36

+ 18 - 12
docker/k8sfiles/labsl.yml

@@ -9,9 +9,9 @@ spec:
   selector:
     app: labsl
   ports:
-  - port: 8080
-    targetPort: 8080
-    name: server-port
+    - port: 8080
+      targetPort: 8080
+      name: server-port
 
 ---
 apiVersion: apps/v1
@@ -19,6 +19,7 @@ kind: Deployment
 metadata:
   name: labsl
 spec:
+  replicas: 1
   selector:
     matchLabels:
       app: labsl
@@ -27,27 +28,32 @@ spec:
       labels:
         app: labsl
     spec:
+      imagePullSecrets:
+        - name: persagy
       containers:
-        - image: registry.persagy.com/ftp/labsl:m0.0.3
-          imagePullPolicy: IfNotPresent
-          name: labsl
+        - name: labsl
+          image: labisenlin.persagy.com/library/labsl:develop-fbcc3cd
+          imagePullPolicy: Always
           ports:
             - containerPort: 8080
               name: server-port
+          env:
+            - name: TZ
+              value: Asia/Shanghai
           resources:
             limits:
               memory: 4Gi
             requests:
               memory: 1Gi
           volumeMounts:
-            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
-              name: admpath
+            - name: admpath
+              mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
               subPath: path/to/application.yml
       volumes:
-        - configMap:
+        - name: admpath
+          configMap:
+            name: labsl
             defaultMode: 511
             items:
               - key: application.yml
-                path: path/to/application.yml
-            name: labsl
-          name: admpath
+                path: path/to/application.yml

+ 15 - 9
docker/k8sfiles/meiku.yml

@@ -19,6 +19,7 @@ kind: Deployment
 metadata:
   name: meiku
 spec:
+  replicas: 1
   selector:
     matchLabels:
       app: meiku
@@ -27,27 +28,32 @@ spec:
       labels:
         app: meiku
     spec:
+      imagePullSecrets:
+        - name: persagy
       containers:
-        - image: registry.persagy.com/ftp/meiku:m0.0.3
-          imagePullPolicy: IfNotPresent
-          name: meiku
+        - name: meiku
+          image: labisenlin.persagy.com/library/meiku:develop-fbcc3cd
+          imagePullPolicy: Always
           ports:
             - containerPort: 8080
               name: server-port
+          env:
+            - name: TZ
+              value: Asia/Shanghai
           resources:
             limits:
               memory: 4Gi
             requests:
               memory: 1Gi
           volumeMounts:
-            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
-              name: admpath
+            - name: admpath
+              mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
               subPath: path/to/application.yml
       volumes:
-        - configMap:
+        - name: admpath
+          configMap:
+            name: meiku
             defaultMode: 511
             items:
               - key: application.yml
-                path: path/to/application.yml
-            name: meiku
-          name: admpath
+                path: path/to/application.yml

+ 15 - 9
docker/k8sfiles/message-center.yml

@@ -19,6 +19,7 @@ kind: Deployment
 metadata:
   name: message-center
 spec:
+  replicas: 1
   selector:
     matchLabels:
       app: message-center
@@ -27,27 +28,32 @@ spec:
       labels:
         app: message-center
     spec:
+      imagePullSecrets:
+        - name: persagy
       containers:
-        - image: registry.persagy.com/ftp/message-center:m0.0.3
-          imagePullPolicy: IfNotPresent
-          name: message-center
+        - name: message-center
+          image: labisenlin.persagy.com/library/message-center:develop-fbcc3cd
+          imagePullPolicy: Always
           ports:
             - containerPort: 8080
               name: server-port
+          env:
+            - name: TZ
+              value: Asia/Shanghai
           resources:
             limits:
               memory: 4Gi
             requests:
               memory: 1Gi
           volumeMounts:
-            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
-              name: admpath
+            - name: admpath
+              mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
               subPath: path/to/application.yml
       volumes:
-        - configMap:
+        - name: admpath
+          configMap:
+            name: message-center
             defaultMode: 511
             items:
               - key: application.yml
-                path: path/to/application.yml
-            name: message-center
-          name: admpath
+                path: path/to/application.yml

+ 12 - 12
docker/k8sfiles/revit-algorithm.yml

@@ -31,29 +31,29 @@ spec:
       imagePullSecrets:
         - name: persagy
       containers:
-        env:
-          - name: TZ
-            value: Asia/Shanghai
+      - name: revit-algorithm
         image: labisenlin.persagy.com/library/revit-algorithm:develop-fbcc3cd
         imagePullPolicy: Always
-        name: revit-algorithm
         ports:
-          - containerPort: 8080
-            name: server-port
+        - containerPort: 8080
+          name: server-port
+        env:
+        - name: TZ
+          value: Asia/Shanghai
         resources:
           limits:
             memory: 4Gi
           requests:
             memory: 1Gi
         volumeMounts:
-          - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
-            name: admpath
+          - name: admpath
+            mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
             subPath: path/to/application.yml
       volumes:
-        - configMap:
+        - name: admpath
+          configMap:
+            name: revit-algorithm
             defaultMode: 511
             items:
               - key: application.yml
-                path: path/to/application.yml
-            name: revit-algorithm
-          name: admpath
+                path: path/to/application.yml

+ 15 - 9
docker/k8sfiles/scheduler.yml

@@ -19,6 +19,7 @@ kind: Deployment
 metadata:
   name: scheduler
 spec:
+  replicas: 1
   selector:
     matchLabels:
       app: scheduler
@@ -27,27 +28,32 @@ spec:
       labels:
         app: scheduler
     spec:
+      imagePullSecrets:
+        - name: persagy
       containers:
-        - image: registry.persagy.com/ftp/scheduler:m0.0.3
-          imagePullPolicy: IfNotPresent
-          name: scheduler
+        - name: scheduler
+          image: labisenlin.persagy.com/library/scheduler:develop-fbcc3cd
+          imagePullPolicy: Always
           ports:
             - containerPort: 8080
               name: server-port
+          env:
+            - name: TZ
+              value: Asia/Shanghai
           resources:
             limits:
               memory: 4Gi
             requests:
               memory: 1Gi
           volumeMounts:
-            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
-              name: admpath
+            - name: admpath
+              mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
               subPath: path/to/application.yml
       volumes:
-        - configMap:
+        - name: admpath
+          configMap:
+            name: scheduler
             defaultMode: 511
             items:
               - key: application.yml
-                path: path/to/application.yml
-            name: scheduler
-          name: admpath
+                path: path/to/application.yml