ソースを参照

编写k8s的yml文件

lijie 3 年 前
コミット
b852ef7a60

+ 23 - 47
docker/k8sfiles/labsl.yml

@@ -19,7 +19,6 @@ kind: Deployment
 metadata:
   name: labsl
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: labsl
@@ -29,49 +28,26 @@ spec:
         app: labsl
     spec:
       containers:
-      - name: labsl
-        image: labisenlin.persagy.com/library/labsl:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-          name: server-port
-        env:
-        - name: TZ
-          value: Asia/Shanghai
-        - name: SERVER_PORT
-          value: "8080"
-        - name: SPRING_CLOUD_CONFIG_URI
-          valueFrom:
-            configMapKeyRef:
-              name: labsl
-              key: spring.cloud.config.uri
-        - name: SPRING_PROFILES_ACTIVE
-          valueFrom:
-            configMapKeyRef:
-              name: labsl
-              key: spring.profiles.active
-        - name: SPRING_CLOUD_CONFIG_PROFILE
-          valueFrom:
-            configMapKeyRef:
-              name: labsl
-              key: spring.cloud.config.profile
-        - name: EUREKA_CLIENT_FETCH_REGISTRY
-          valueFrom:
-            configMapKeyRef:
-              name: labsl
-              key: eureka.client.fetch-registry
-        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
-          valueFrom:
-            configMapKeyRef:
-              name: labsl
-              key: eureka.client.register-with-eureka
-        - name: EUREKA_CLIENT_DEFAULT_ZONE
-          valueFrom:
-            configMapKeyRef:
-              name: labsl
-              key: eureka.client.default.zone
-        - name: EUREKA_INSTANCE_IP_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              name: labsl
-              key: eureka.instance.ip.address
+        - image: registry.persagy.com/ftp/labsl:m0.0.3
+          imagePullPolicy: IfNotPresent
+          name: labsl
+          ports:
+            - containerPort: 8080
+              name: server-port
+          resources:
+            limits:
+              memory: 4Gi
+            requests:
+              memory: 1Gi
+          volumeMounts:
+            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
+              name: admpath
+              subPath: path/to/application.yml
+      volumes:
+        - configMap:
+            defaultMode: 511
+            items:
+              - key: application.yml
+                path: path/to/application.yml
+            name: labsl
+          name: admpath

+ 26 - 50
docker/k8sfiles/meiku.yml

@@ -9,9 +9,9 @@ spec:
   selector:
     app: meiku
   ports:
-  - port: 8080
-    targetPort: 8080
-    name: server-port
+    - port: 8080
+      targetPort: 8080
+      name: server-port
 
 ---
 apiVersion: apps/v1
@@ -19,7 +19,6 @@ kind: Deployment
 metadata:
   name: meiku
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: meiku
@@ -29,49 +28,26 @@ spec:
         app: meiku
     spec:
       containers:
-      - name: meiku
-        image: labisenlin.persagy.com/library/meiku:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-          name: server-port
-        env:
-        - name: TZ
-          value: Asia/Shanghai
-        - name: SERVER_PORT
-          value: "8080"
-        - name: SPRING_CLOUD_CONFIG_URI
-          valueFrom:
-            configMapKeyRef:
-              name: meiku
-              key: spring.cloud.config.uri
-        - name: SPRING_PROFILES_ACTIVE
-          valueFrom:
-            configMapKeyRef:
-              name: meiku
-              key: spring.profiles.active
-        - name: SPRING_CLOUD_CONFIG_PROFILE
-          valueFrom:
-            configMapKeyRef:
-              name: meiku
-              key: spring.cloud.config.profile
-        - name: EUREKA_CLIENT_FETCH_REGISTRY
-          valueFrom:
-            configMapKeyRef:
-              name: meiku
-              key: eureka.client.fetch-registry
-        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
-          valueFrom:
-            configMapKeyRef:
-              name: meiku
-              key: eureka.client.register-with-eureka
-        - name: EUREKA_CLIENT_DEFAULT_ZONE
-          valueFrom:
-            configMapKeyRef:
-              name: meiku
-              key: eureka.client.default.zone
-        - name: EUREKA_INSTANCE_IP_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              name: meiku
-              key: eureka.instance.ip.address
+        - image: registry.persagy.com/ftp/meiku:m0.0.3
+          imagePullPolicy: IfNotPresent
+          name: meiku
+          ports:
+            - containerPort: 8080
+              name: server-port
+          resources:
+            limits:
+              memory: 4Gi
+            requests:
+              memory: 1Gi
+          volumeMounts:
+            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
+              name: admpath
+              subPath: path/to/application.yml
+      volumes:
+        - configMap:
+            defaultMode: 511
+            items:
+              - key: application.yml
+                path: path/to/application.yml
+            name: meiku
+          name: admpath

+ 26 - 50
docker/k8sfiles/message-center.yml

@@ -9,9 +9,9 @@ spec:
   selector:
     app: message-center
   ports:
-  - port: 8080
-    targetPort: 8080
-    name: server-port
+    - port: 8080
+      targetPort: 8080
+      name: server-port
 
 ---
 apiVersion: apps/v1
@@ -19,7 +19,6 @@ kind: Deployment
 metadata:
   name: message-center
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: message-center
@@ -29,49 +28,26 @@ spec:
         app: message-center
     spec:
       containers:
-      - name: message-center
-        image: labisenlin.persagy.com/library/message-center:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-          name: server-port
-        env:
-        - name: TZ
-          value: Asia/Shanghai
-        - name: SERVER_PORT
-          value: "8080"
-        - name: SPRING_CLOUD_CONFIG_URI
-          valueFrom:
-            configMapKeyRef:
-              name: message-center
-              key: spring.cloud.config.uri
-        - name: SPRING_PROFILES_ACTIVE
-          valueFrom:
-            configMapKeyRef:
-              name: message-center
-              key: spring.profiles.active
-        - name: SPRING_CLOUD_CONFIG_PROFILE
-          valueFrom:
-            configMapKeyRef:
-              name: message-center
-              key: spring.cloud.config.profile
-        - name: EUREKA_CLIENT_FETCH_REGISTRY
-          valueFrom:
-            configMapKeyRef:
-              name: message-center
-              key: eureka.client.fetch-registry
-        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
-          valueFrom:
-            configMapKeyRef:
-              name: message-center
-              key: eureka.client.register-with-eureka
-        - name: EUREKA_CLIENT_DEFAULT_ZONE
-          valueFrom:
-            configMapKeyRef:
-              name: message-center
-              key: eureka.client.default.zone
-        - name: EUREKA_INSTANCE_IP_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              name: message-center
-              key: eureka.instance.ip.address
+        - image: registry.persagy.com/ftp/message-center:m0.0.3
+          imagePullPolicy: IfNotPresent
+          name: message-center
+          ports:
+            - containerPort: 8080
+              name: server-port
+          resources:
+            limits:
+              memory: 4Gi
+            requests:
+              memory: 1Gi
+          volumeMounts:
+            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
+              name: admpath
+              subPath: path/to/application.yml
+      volumes:
+        - configMap:
+            defaultMode: 511
+            items:
+              - key: application.yml
+                path: path/to/application.yml
+            name: message-center
+          name: admpath

+ 29 - 47
docker/k8sfiles/revit-algorithm.yml

@@ -9,9 +9,9 @@ spec:
   selector:
     app: revit-algorithm
   ports:
-  - port: 8080
-    targetPort: 8080
-    name: server-port
+    - port: 8080
+      targetPort: 8080
+      name: server-port
 
 ---
 apiVersion: apps/v1
@@ -28,50 +28,32 @@ spec:
       labels:
         app: revit-algorithm
     spec:
+      imagePullSecrets:
+        - name: persagy
       containers:
-      - name: revit-algorithm
-        image: labisenlin.persagy.com/library/revit-algorithm:latest
+        env:
+          - name: TZ
+            value: Asia/Shanghai
+        image: labisenlin.persagy.com/library/revit-algorithm:develop-fbcc3cd
         imagePullPolicy: Always
+        name: revit-algorithm
         ports:
-        - containerPort: 8080
-          name: server-port
-        env:
-        - name: TZ
-          value: Asia/Shanghai
-        - name: SERVER_PORT
-          value: "8080"
-        - name: SPRING_CLOUD_CONFIG_URI
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: spring.cloud.config.uri
-        - name: SPRING_PROFILES_ACTIVE
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: spring.profiles.active
-        - name: SPRING_CLOUD_CONFIG_PROFILE
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: spring.cloud.config.profile
-        - name: EUREKA_CLIENT_FETCH_REGISTRY
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.client.fetch-registry
-        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.client.register-with-eureka
-        - name: EUREKA_CLIENT_DEFAULT_ZONE
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.client.default.zone
-        - name: EUREKA_INSTANCE_IP_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.instance.ip.address
+          - containerPort: 8080
+            name: server-port
+        resources:
+          limits:
+            memory: 4Gi
+          requests:
+            memory: 1Gi
+        volumeMounts:
+          - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
+            name: admpath
+            subPath: path/to/application.yml
+      volumes:
+        - configMap:
+            defaultMode: 511
+            items:
+              - key: application.yml
+                path: path/to/application.yml
+            name: revit-algorithm
+          name: admpath

+ 32 - 56
docker/k8sfiles/scheduler.yml

@@ -2,76 +2,52 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: revit-algorithm
+  name: scheduler
   labels:
-    app: revit-algorithm
+    app: scheduler
 spec:
   selector:
-    app: revit-algorithm
+    app: scheduler
   ports:
-  - port: 8080
-    targetPort: 8080
-    name: server-port
+    - port: 8080
+      targetPort: 8080
+      name: server-port
 
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: revit-algorithm
+  name: scheduler
 spec:
-  replicas: 1
   selector:
     matchLabels:
-      app: revit-algorithm
+      app: scheduler
   template:
     metadata:
       labels:
-        app: revit-algorithm
+        app: scheduler
     spec:
       containers:
-      - name: revit-algorithm
-        image: labisenlin.persagy.com/library/revit-algorithm:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-          name: server-port
-        env:
-        - name: TZ
-          value: Asia/Shanghai
-        - name: SERVER_PORT
-          value: "8080"
-        - name: SPRING_CLOUD_CONFIG_URI
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: spring.cloud.config.uri
-        - name: SPRING_PROFILES_ACTIVE
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: spring.profiles.active
-        - name: SPRING_CLOUD_CONFIG_PROFILE
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: spring.cloud.config.profile
-        - name: EUREKA_CLIENT_FETCH_REGISTRY
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.client.fetch-registry
-        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.client.register-with-eureka
-        - name: EUREKA_CLIENT_DEFAULT_ZONE
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.client.default.zone
-        - name: EUREKA_INSTANCE_IP_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              name: revit-algorithm
-              key: eureka.instance.ip.address
+        - image: registry.persagy.com/ftp/scheduler:m0.0.3
+          imagePullPolicy: IfNotPresent
+          name: scheduler
+          ports:
+            - containerPort: 8080
+              name: server-port
+          resources:
+            limits:
+              memory: 4Gi
+            requests:
+              memory: 1Gi
+          volumeMounts:
+            - mountPath: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/application.yml
+              name: admpath
+              subPath: path/to/application.yml
+      volumes:
+        - configMap:
+            defaultMode: 511
+            items:
+              - key: application.yml
+                path: path/to/application.yml
+            name: scheduler
+          name: admpath