正在显示
1 个修改的文件
包含
31 行增加
和
25 行删除
1 | apiVersion: v1 | 1 | apiVersion: v1 |
2 | kind: Service | 2 | kind: Service |
3 | metadata: | 3 | metadata: |
4 | - name: opp | 4 | + name: mmm-oppmg |
5 | namespace: mmm-suplus-prd | 5 | namespace: mmm-suplus-prd |
6 | labels: | 6 | labels: |
7 | - k8s-app: opp | 7 | + k8s-app: mmm-oppmg |
8 | spec: | 8 | spec: |
9 | ports: | 9 | ports: |
10 | - name: "http" | 10 | - name: "http" |
11 | port: 80 | 11 | port: 80 |
12 | - targetPort: 8082 | 12 | + targetPort: 8080 |
13 | selector: | 13 | selector: |
14 | - k8s-app: opp | 14 | + k8s-app: mmm-oppmg |
15 | --- | 15 | --- |
16 | apiVersion: extensions/v1beta1 | 16 | apiVersion: extensions/v1beta1 |
17 | kind: Deployment | 17 | kind: Deployment |
18 | metadata: | 18 | metadata: |
19 | - name: opp | 19 | + name: mmm-oppmg |
20 | namespace: mmm-suplus-prd | 20 | namespace: mmm-suplus-prd |
21 | labels: | 21 | labels: |
22 | - k8s-app: opp | 22 | + k8s-app: mmm-oppmg |
23 | spec: | 23 | spec: |
24 | replicas: 1 | 24 | replicas: 1 |
25 | template: | 25 | template: |
26 | metadata: | 26 | metadata: |
27 | labels: | 27 | labels: |
28 | - k8s-app: opp | 28 | + k8s-app: mmm-oppmg |
29 | spec: | 29 | spec: |
30 | affinity: | 30 | affinity: |
31 | nodeAffinity: | 31 | nodeAffinity: |
@@ -43,20 +43,17 @@ spec: | @@ -43,20 +43,17 @@ spec: | ||
43 | - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb | 43 | - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb |
44 | - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy | 44 | - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy |
45 | containers: | 45 | containers: |
46 | - - name: opp | ||
47 | - image: 192.168.0.243:5000/mmm/opp:master | 46 | + - name: mmm-oppmg |
47 | + image: 192.168.0.243:5000/mmm/mmm-oppmg:master | ||
48 | imagePullPolicy: Always | 48 | imagePullPolicy: Always |
49 | - ports: | ||
50 | - - containerPort: 8082 | ||
51 | volumeMounts: | 49 | volumeMounts: |
52 | - mountPath: /opt/logs | 50 | - mountPath: /opt/logs |
53 | name: accesslogs | 51 | name: accesslogs |
52 | + - mountPath: /var/www/oppmg/file | ||
53 | + name: opportunity-pvc1 | ||
54 | + ports: | ||
55 | + - containerPort: 8080 | ||
54 | env: | 56 | env: |
55 | - - name: ENTERPRISE_SERVICE_HOST | ||
56 | - valueFrom: | ||
57 | - configMapKeyRef: | ||
58 | - name: suplus-config | ||
59 | - key: service.enterprise | ||
60 | - name: MYSQL_HOST | 57 | - name: MYSQL_HOST |
61 | valueFrom: | 58 | valueFrom: |
62 | configMapKeyRef: | 59 | configMapKeyRef: |
@@ -67,6 +64,16 @@ spec: | @@ -67,6 +64,16 @@ spec: | ||
67 | configMapKeyRef: | 64 | configMapKeyRef: |
68 | name: suplus-config | 65 | name: suplus-config |
69 | key: mysql.port | 66 | key: mysql.port |
67 | + - name: REDIS_HOST | ||
68 | + valueFrom: | ||
69 | + configMapKeyRef: | ||
70 | + name: suplus-config | ||
71 | + key: redis.ip | ||
72 | + - name: REDIS_PORT | ||
73 | + valueFrom: | ||
74 | + configMapKeyRef: | ||
75 | + name: suplus-config | ||
76 | + key: redis.port | ||
70 | - name: MYSQL_USER | 77 | - name: MYSQL_USER |
71 | valueFrom: | 78 | valueFrom: |
72 | configMapKeyRef: | 79 | configMapKeyRef: |
@@ -78,19 +85,18 @@ spec: | @@ -78,19 +85,18 @@ spec: | ||
78 | name: suplus-config | 85 | name: suplus-config |
79 | key: mysql.password | 86 | key: mysql.password |
80 | - name: MYSQL_DB_NAME | 87 | - name: MYSQL_DB_NAME |
81 | - value: "opp" | ||
82 | - - name: LOG_LEVEL | ||
83 | - value: "debug" | ||
84 | - - name: ERROR_BASE_CODE | ||
85 | - value: "9" | ||
86 | - - name: ERROR_BASE_CODE_MULTIPLE | ||
87 | - value: "1000" | 88 | + value: "opportunity" |
88 | - name: RUN_MODE | 89 | - name: RUN_MODE |
89 | value: "prod" | 90 | value: "prod" |
90 | - - name: aliyun_logs_suplus | 91 | + - name: LOG_LEVEL |
92 | + value: "debug" | ||
93 | + - name: aliyun_logs_suplusfile | ||
91 | value: "stdout" | 94 | value: "stdout" |
92 | - name: aliyun_logs_access | 95 | - name: aliyun_logs_access |
93 | - value: "/opt/logs/app.log" | 96 | + value: " /opt/logs/app.log" |
94 | volumes: | 97 | volumes: |
95 | - name: accesslogs | 98 | - name: accesslogs |
96 | emptyDir: {} | 99 | emptyDir: {} |
100 | + - name: opportunity-pvc1 | ||
101 | + persistentVolumeClaim: | ||
102 | + claimName: opportunity-pvc |
-
请 注册 或 登录 后发表评论