Преглед на файлове

优化:调整k8s部署文件

lijie преди 3 години
родител
ревизия
3713122679
променени са 2 файла, в които са добавени 99 реда и са изтрити 31 реда
  1. 77 0
      docker/k8sfiles/adm-middleware-bak.yml
  2. 22 31
      docker/k8sfiles/adm-middleware.yml

+ 77 - 0
docker/k8sfiles/adm-middleware-bak.yml

@@ -0,0 +1,77 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: adm-middleware
+  labels:
+    app: adm-middleware
+spec:
+  selector:
+    app: adm-middleware
+  ports:
+  - port: 8080
+    targetPort: 8080
+    name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: adm-middleware
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: adm-middleware
+  template:
+    metadata:
+      labels:
+        app: adm-middleware
+    spec:
+      containers:
+      - name: adm-middleware
+        image: labisenlin.persagy.com/library/adm-middleware: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: adm-middleware
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: adm-middleware
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: adm-middleware
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: adm-middleware
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: adm-middleware
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: adm-middleware
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: adm-middleware
+              key: eureka.instance.ip.address

+ 22 - 31
docker/k8sfiles/adm-middleware.yml

@@ -41,37 +41,28 @@ spec:
         - name: SERVER_PORT
           value: "8080"
         - name: SPRING_CLOUD_CONFIG_URI
-          valueFrom:
-            configMapKeyRef:
-              name: adm-middleware
-              key: spring.cloud.config.uri
+          value: "http://integrated-config:8080"
         - name: SPRING_PROFILES_ACTIVE
-          valueFrom:
-            configMapKeyRef:
-              name: adm-middleware
-              key: spring.profiles.active
+          value: "dev"
         - name: SPRING_CLOUD_CONFIG_PROFILE
-          valueFrom:
-            configMapKeyRef:
-              name: adm-middleware
-              key: spring.cloud.config.profile
-        - name: EUREKA_CLIENT_FETCH_REGISTRY
-          valueFrom:
-            configMapKeyRef:
-              name: adm-middleware
-              key: eureka.client.fetch-registry
-        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
-          valueFrom:
-            configMapKeyRef:
-              name: adm-middleware
-              key: eureka.client.register-with-eureka
+          value: "dev"
         - name: EUREKA_CLIENT_DEFAULT_ZONE
-          valueFrom:
-            configMapKeyRef:
-              name: adm-middleware
-              key: eureka.client.default.zone
-        - name: EUREKA_INSTANCE_IP_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              name: adm-middleware
-              key: eureka.instance.ip.address
+          value: "http://frame:123456@integrated-eureka:8080/integrated-eureka/eureka/"
+        - name: logging.config
+          value: classpath:logback-spring.xml
+        - name: eureka.instance.status-page-url
+          value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/info"
+        - name: eureka.instance.non-secure-port-enabled
+          value: "true"
+        - name: eureka.instance.ip-address
+          value: "adm-middleware"
+        - name: eureka.instance.health-check-url
+          value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/health"
+        - name: eureka.instance.non-secure-port
+          value: "8080"
+        - name: persagy.common.auth.channel
+          value: "1"
+        - name: saas.ems.web.service
+          value: "http://ems-saas-web:8080"
+        - name: persagy.common.sql.limit
+          value: "100000"