mmm-go / openapi · 提交

转到一个项目

作者 yangfu
提交 546ce8bcd6a88f7fc0b5088e6280cbab0a7a1048 1 个父辈 39628eb1

修改k8s配置

内嵌 并排对比
正在显示 9 个修改的文件 包含 75 行增加 和 188 行删除
1 [dev-online] 1 [dev-online]
2 -#Ali could  
3 -#AccessKeyID ="LTAI4FhiZ3UktC6N1u3H5GFC"  
4 -#AccessKeySecret ="UyspWwdni55CYQ02hUCint4qY2jNYO"  
5 -AccessKeyID ="LTAI4Fz1LUBW2fXp6QWaJHRS"  
6 -AccessKeySecret ="aLZXwK8pgrs10Ws03qcN7NsrSXFVsg"  
7 -  
8 #日志 2 #日志
9 log_level = "${LOG_LEVEL||debug}" 3 log_level = "${LOG_LEVEL||debug}"
10 aliyun_logs_access ="${aliyun_logs_access||F:/log/app.log}" 4 aliyun_logs_access ="${aliyun_logs_access||F:/log/app.log}"
11 5
  6 +#Ali could
  7 +AccessKeyID ="LTAI4Fz1LUBW2fXp6QWaJHRS"
  8 +AccessKeySecret ="aLZXwK8pgrs10Ws03qcN7NsrSXFVsg"
  9 +
12 #阿里云 10 #阿里云
13 #cname ="https://media.goexample.live/" 11 #cname ="https://media.goexample.live/"
14 cname ="https://media.fjmaimaimai.com/" 12 cname ="https://media.fjmaimaimai.com/"
1 [prod] 1 [prod]
2 -#Ali could  
3 -#AccessKeyID ="LTAI4FhiZ3UktC6N1u3H5GFC"  
4 -#AccessKeySecret ="UyspWwdni55CYQ02hUCint4qY2jNYO"  
5 -AccessKeyID ="LTAI4Fz1LUBW2fXp6QWaJHRS"  
6 -AccessKeySecret ="aLZXwK8pgrs10Ws03qcN7NsrSXFVsg"  
7 -  
8 #日志 2 #日志
9 log_level = "${LOG_LEVEL||debug}" 3 log_level = "${LOG_LEVEL||debug}"
10 aliyun_logs_access ="${aliyun_logs_access||F:/log/app.log}" 4 aliyun_logs_access ="${aliyun_logs_access||F:/log/app.log}"
11 5
  6 +#Ali could
  7 +AccessKeyID ="LTAI4Fz1LUBW2fXp6QWaJHRS"
  8 +AccessKeySecret ="aLZXwK8pgrs10Ws03qcN7NsrSXFVsg"
  9 +
12 #阿里云 10 #阿里云
13 #cname ="https://media.goexample.live/" 11 #cname ="https://media.goexample.live/"
14 cname ="https://media.fjmaimaimai.com/" 12 cname ="https://media.fjmaimaimai.com/"
1 [test] 1 [test]
  2 +#日志
  3 +log_level = "${LOG_LEVEL||debug}"
  4 +aliyun_logs_access ="${aliyun_logs_access||F:/log/app.log}"
  5 +
2 #Ali could 6 #Ali could
3 -AccessKeyID ="LTAI4FhiZ3UktC6N1u3H5GFC"  
4 -AccessKeySecret ="UyspWwdni55CYQ02hUCint4qY2jNYO"  
  7 +AccessKeyID ="LTAI4Fz1LUBW2fXp6QWaJHRS"
  8 +AccessKeySecret ="aLZXwK8pgrs10Ws03qcN7NsrSXFVsg"
  9 +
  10 +#阿里云
  11 +cname ="https://media.fjmaimaimai.com/"
@@ -84,8 +84,6 @@ spec: @@ -84,8 +84,6 @@ spec:
84 configMapKeyRef: 84 configMapKeyRef:
85 name: suplus-config 85 name: suplus-config
86 key: mysql.password 86 key: mysql.password
87 - - name: MYSQL_DB_NAME  
88 - value: "opportunity_dev"  
89 - name: RUN_MODE 87 - name: RUN_MODE
90 value: "dev-online" 88 value: "dev-online"
91 - name: LOG_LEVEL 89 - name: LOG_LEVEL
1 #!/bin/bash 1 #!/bin/bash
2 export PATH=/root/local/bin:$PATH 2 export PATH=/root/local/bin:$PATH
3 -kubectl -n mmm-suplus-prd get pods | grep -q mmmopp 3 +kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
4 if [ "$?" == "1" ];then 4 if [ "$?" == "1" ];then
5 - kubectl create -f /tmp/prd/mmm-go-opp/opp.yaml --record  
6 - kubectl -n mmm-suplus-prd get svc | grep -q mmmopp 5 + kubectl create -f /tmp/prd/mmm-open-api/mmm-open-api.yaml --record
  6 + kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
7 if [ "$?" == "0" ];then 7 if [ "$?" == "0" ];then
8 - echo "mmmopp service install success!" 8 + echo "mmm-open-api service install success!"
9 else 9 else
10 - echo "mmmopp service install fail!" 10 + echo "mmm-open-api service install fail!"
11 fi 11 fi
12 - kubectl -n mmm-suplus-prd get pods | grep -q mmmopp 12 + kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
13 if [ "$?" == "0" ];then 13 if [ "$?" == "0" ];then
14 - echo "mmmopp deployment install success!" 14 + echo "mmm-open-api deployment install success!"
15 else 15 else
16 - echo "mmmopp deployment install fail!" 16 + echo "mmm-open-api deployment install fail!"
17 fi 17 fi
18 else 18 else
19 - kubectl delete -f /tmp/prd/mmm-go-opp/opp.yaml  
20 - kubectl -n mmm-suplus-prd get svc | grep -q mmmopp 19 + kubectl delete -f /tmp/prd/mmm-open-api/mmm-open-api.yaml
  20 + kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
21 while [ "$?" == "0" ] 21 while [ "$?" == "0" ]
22 do 22 do
23 - kubectl -n mmm-suplus-prd get svc | grep -q mmmopp 23 + kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
24 done 24 done
25 - kubectl -n mmm-suplus-prd get pods | grep -q mmmopp 25 + kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
26 while [ "$?" == "0" ] 26 while [ "$?" == "0" ]
27 do 27 do
28 - kubectl -n mmm-suplus-prd get pods | grep -q mmmopp 28 + kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
29 done 29 done
30 - kubectl create -f /tmp/prd/mmm-go-opp/opp.yaml --record  
31 - kubectl -n mmm-suplus-prd get svc | grep -q mmmopp 30 + kubectl create -f /tmp/prd/mmm-open-api/mmm-open-api.yaml --record
  31 + kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
32 if [ "$?" == "0" ];then 32 if [ "$?" == "0" ];then
33 - echo "mmmopp service update success!" 33 + echo "mmm-open-api service update success!"
34 else 34 else
35 - echo "opp service update fail!" 35 + echo "mmm-open-api service update fail!"
36 fi 36 fi
37 - kubectl -n mmm-suplus-prd get pods | grep -q opp 37 + kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
38 if [ "$?" == "0" ];then 38 if [ "$?" == "0" ];then
39 - echo "opp deployment update success!" 39 + echo "mmm-open-api deployment update success!"
40 else 40 else
41 - echo "opp deployment update fail!" 41 + echo "mmm-open-api deployment update fail!"
42 fi 42 fi
43 fi 43 fi
1 apiVersion: v1 1 apiVersion: v1
2 kind: Service 2 kind: Service
3 metadata: 3 metadata:
4 - name: mmmopenapi  
5 - namespace: mmm-suplus-dev 4 + name: mmm-open-api
  5 + namespace: mmm-suplus-prd
6 labels: 6 labels:
7 - k8s-app: mmmopenapi 7 + k8s-app: mmm-open-api
8 spec: 8 spec:
9 ports: 9 ports:
10 - name: "http" 10 - name: "http"
11 port: 80 11 port: 80
12 targetPort: 8080 12 targetPort: 8080
13 selector: 13 selector:
14 - k8s-app: mmmopenapi 14 + k8s-app: mmm-open-api
15 --- 15 ---
16 apiVersion: extensions/v1beta1 16 apiVersion: extensions/v1beta1
17 kind: Deployment 17 kind: Deployment
18 metadata: 18 metadata:
19 - name: mmmopenapi  
20 - namespace: mmm-suplus-dev 19 + name: mmm-open-api
  20 + namespace: mmm-suplus-prd
21 labels: 21 labels:
22 - k8s-app: mmmopenapi 22 + k8s-app: mmm-open-api
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: mmmopenapi 28 + k8s-app: mmm-open-api
29 spec: 29 spec:
30 affinity: 30 affinity:
31 nodeAffinity: 31 nodeAffinity:
@@ -43,8 +43,8 @@ spec: @@ -43,8 +43,8 @@ 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: mmmopenapi  
47 - image: 192.168.0.243:5000/mmm/mmmopenapi:dev 46 + - name: mmm-open-api
  47 + image: 192.168.0.243:5000/mmm/mmm-open-api:dev
48 imagePullPolicy: Always 48 imagePullPolicy: Always
49 volumeMounts: 49 volumeMounts:
50 - mountPath: /opt/logs 50 - mountPath: /opt/logs
@@ -84,10 +84,8 @@ spec: @@ -84,10 +84,8 @@ spec:
84 configMapKeyRef: 84 configMapKeyRef:
85 name: suplus-config 85 name: suplus-config
86 key: mysql.password 86 key: mysql.password
87 - - name: MYSQL_DB_NAME  
88 - value: "opportunity_dev"  
89 - name: RUN_MODE 87 - name: RUN_MODE
90 - value: "dev-online" 88 + value: "prod"
91 - name: LOG_LEVEL 89 - name: LOG_LEVEL
92 value: "debug" 90 value: "debug"
93 - name: aliyun_logs_suplusfile 91 - name: aliyun_logs_suplusfile
1 -apiVersion: v1  
2 -kind: Service  
3 -metadata:  
4 - name: mmmopp  
5 - namespace: mmm-suplus-prd  
6 - labels:  
7 - k8s-app: mmmopp  
8 -spec:  
9 - ports:  
10 - - name: "http"  
11 - port: 80  
12 - targetPort: 8080  
13 - - name: "https"  
14 - port: 443  
15 - targetPort: 443  
16 - selector:  
17 - k8s-app: mmmopp  
18 ----  
19 -apiVersion: extensions/v1beta1  
20 -kind: Deployment  
21 -metadata:  
22 - name: mmmopp  
23 - namespace: mmm-suplus-prd  
24 - labels:  
25 - k8s-app: mmmopp  
26 -spec:  
27 - replicas: 1  
28 - template:  
29 - metadata:  
30 - labels:  
31 - k8s-app: mmmopp  
32 - spec:  
33 - affinity:  
34 - nodeAffinity:  
35 - preferredDuringSchedulingIgnoredDuringExecution:  
36 - - preference: {}  
37 - weight: 100  
38 - requiredDuringSchedulingIgnoredDuringExecution:  
39 - nodeSelectorTerms:  
40 - - matchExpressions:  
41 - - key: kubernetes.io/hostname  
42 - operator: In  
43 - values:  
44 - - cn-hangzhou.i-bp1djh1xn7taumbue1ze  
45 - - cn-hangzhou.i-bp1djh1xn7taumbue1zd  
46 - - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb  
47 - - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy  
48 - containers:  
49 - - name: mmmopp  
50 - image: 192.168.0.243:5000/mmm/mmmopp:master  
51 - imagePullPolicy: Always  
52 - volumeMounts:  
53 - - mountPath: /opt/logs  
54 - name: accesslogs  
55 - - mountPath: /var/www/opp/file  
56 - name: opportunity-pvc1  
57 - ports:  
58 - - containerPort: 8080  
59 - - containerPort: 443  
60 - env:  
61 - - name: MYSQL_HOST  
62 - valueFrom:  
63 - configMapKeyRef:  
64 - name: suplus-config  
65 - key: mysql.host  
66 - - name: MYSQL_PORT  
67 - valueFrom:  
68 - configMapKeyRef:  
69 - name: suplus-config  
70 - key: mysql.port  
71 - - name: REDIS_HOST  
72 - valueFrom:  
73 - configMapKeyRef:  
74 - name: suplus-config  
75 - key: redis.ip  
76 - - name: REDIS_PORT  
77 - valueFrom:  
78 - configMapKeyRef:  
79 - name: suplus-config  
80 - key: redis.port  
81 - - name: MYSQL_USER  
82 - valueFrom:  
83 - configMapKeyRef:  
84 - name: suplus-config  
85 - key: mysql.user  
86 - - name: MYSQL_PASSWORD  
87 - valueFrom:  
88 - configMapKeyRef:  
89 - name: suplus-config  
90 - key: mysql.password  
91 - - name: MYSQL_DB_NAME  
92 - value: "opportunity"  
93 - - name: RUN_MODE  
94 - value: "prod"  
95 - - name: LOG_LEVEL  
96 - value: "debug"  
97 - - name: aliyun_logs_suplusfile  
98 - value: "stdout"  
99 - - name: aliyun_logs_access  
100 - value: " /opt/logs/app.log"  
101 - volumes:  
102 - - name: accesslogs  
103 - emptyDir: {}  
104 - - name: opportunity-pvc1  
105 - persistentVolumeClaim:  
106 - claimName: opportunity-pvc5  
1 #!/bin/bash 1 #!/bin/bash
2 export PATH=/root/local/bin:$PATH 2 export PATH=/root/local/bin:$PATH
3 -kubectl -n mmm-suplus-test get pods | grep -q mmmopp 3 +kubectl -n mmm-suplus-test get pods | grep -q mmm-open-api
4 if [ "$?" == "1" ];then 4 if [ "$?" == "1" ];then
5 - kubectl create -f /tmp/test/mmm-go-opp/opp.yaml --record  
6 - kubectl -n mmm-suplus-test get svc | grep -q mmmopp 5 + kubectl create -f /tmp/test/mmm-open-api/mmm-open-api.yaml --record
  6 + kubectl -n mmm-suplus-test get svc | grep -q mmm-open-api
7 if [ "$?" == "0" ];then 7 if [ "$?" == "0" ];then
8 - echo "mmmopp service install success!" 8 + echo "mmm-open-api service install success!"
9 else 9 else
10 - echo "mmmopp service install fail!" 10 + echo "mmm-open-api service install fail!"
11 fi 11 fi
12 - kubectl -n mmm-suplus-test get pods | grep -q mmmopp 12 + kubectl -n mmm-suplus-test get pods | grep -q mmm-open-api
13 if [ "$?" == "0" ];then 13 if [ "$?" == "0" ];then
14 - echo "mmmopp deployment install success!" 14 + echo "mmm-open-api deployment install success!"
15 else 15 else
16 - echo "mmmopp deployment install fail!" 16 + echo "mmm-open-api deployment install fail!"
17 fi 17 fi
18 else 18 else
19 - kubectl delete -f /tmp/test/mmm-go-opp/opp.yaml  
20 - kubectl -n mmm-suplus-test get svc | grep -q mmmopp 19 + kubectl delete -f /tmp/test/mmm-open-api/mmm-open-api.yaml
  20 + kubectl -n mmm-suplus-test get svc | grep -q mmm-open-api
21 while [ "$?" == "0" ] 21 while [ "$?" == "0" ]
22 do 22 do
23 - kubectl -n mmm-suplus-test get svc | grep -q mmmopp 23 + kubectl -n mmm-suplus-test get svc | grep -q mmm-open-api
24 done 24 done
25 - kubectl -n mmm-suplus-test get pods | grep -q mmmopp 25 + kubectl -n mmm-suplus-test get pods | grep -q mmm-open-api
26 while [ "$?" == "0" ] 26 while [ "$?" == "0" ]
27 do 27 do
28 - kubectl -n mmm-suplus-test get pods | grep -q mmmopp 28 + kubectl -n mmm-suplus-test get pods | grep -q mmm-open-api
29 done 29 done
30 - kubectl create -f /tmp/test/mmm-go-opp/opp.yaml --record  
31 - kubectl -n mmm-suplus-test get svc | grep -q mmmopp 30 + kubectl create -f /tmp/test/mmm-open-api/mmm-open-api.yaml --record
  31 + kubectl -n mmm-suplus-test get svc | grep -q mmm-open-api
32 if [ "$?" == "0" ];then 32 if [ "$?" == "0" ];then
33 - echo "mmmopp service update success!" 33 + echo "mmm-open-api service update success!"
34 else 34 else
35 echo "opp service update fail!" 35 echo "opp service update fail!"
36 fi 36 fi
1 apiVersion: v1 1 apiVersion: v1
2 kind: Service 2 kind: Service
3 metadata: 3 metadata:
4 - name: mmmopp 4 + name: mmm-open-api
5 namespace: mmm-suplus-test 5 namespace: mmm-suplus-test
6 labels: 6 labels:
7 - k8s-app: mmmopp 7 + k8s-app: mmm-open-api
8 spec: 8 spec:
9 ports: 9 ports:
10 - name: "http" 10 - name: "http"
11 port: 80 11 port: 80
12 targetPort: 8080 12 targetPort: 8080
13 - - name: "https"  
14 - port: 443  
15 - targetPort: 443  
16 selector: 13 selector:
17 - k8s-app: mmmopp 14 + k8s-app: mmm-open-api
18 --- 15 ---
19 apiVersion: extensions/v1beta1 16 apiVersion: extensions/v1beta1
20 kind: Deployment 17 kind: Deployment
21 metadata: 18 metadata:
22 - name: mmmopp 19 + name: mmm-open-api
23 namespace: mmm-suplus-test 20 namespace: mmm-suplus-test
24 labels: 21 labels:
25 - k8s-app: mmmopp 22 + k8s-app: mmm-open-api
26 spec: 23 spec:
27 replicas: 1 24 replicas: 1
28 template: 25 template:
29 metadata: 26 metadata:
30 labels: 27 labels:
31 - k8s-app: mmmopp 28 + k8s-app: mmm-open-api
32 spec: 29 spec:
33 affinity: 30 affinity:
34 nodeAffinity: 31 nodeAffinity:
@@ -46,17 +43,16 @@ spec: @@ -46,17 +43,16 @@ spec:
46 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb 43 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
47 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy 44 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
48 containers: 45 containers:
49 - - name: mmmopp  
50 - image: 192.168.0.243:5000/mmm/mmmopp:dev 46 + - name: mmm-open-api
  47 + image: 192.168.0.243:5000/mmm/mmm-open-api:dev
51 imagePullPolicy: Always 48 imagePullPolicy: Always
52 volumeMounts: 49 volumeMounts:
53 - mountPath: /opt/logs 50 - mountPath: /opt/logs
54 name: accesslogs 51 name: accesslogs
55 - mountPath: /var/www/opp/file 52 - mountPath: /var/www/opp/file
56 - name: mmmjihuitest2-pvc1 53 + name: mmmjihuitest-pvc1
57 ports: 54 ports:
58 - containerPort: 8080 55 - containerPort: 8080
59 - - containerPort: 443  
60 env: 56 env:
61 - name: MYSQL_HOST 57 - name: MYSQL_HOST
62 valueFrom: 58 valueFrom:
@@ -88,8 +84,6 @@ spec: @@ -88,8 +84,6 @@ spec:
88 configMapKeyRef: 84 configMapKeyRef:
89 name: suplus-config 85 name: suplus-config
90 key: mysql.password 86 key: mysql.password
91 - - name: MYSQL_DB_NAME  
92 - value: "opportunity_test"  
93 - name: RUN_MODE 87 - name: RUN_MODE
94 value: "test" 88 value: "test"
95 - name: LOG_LEVEL 89 - name: LOG_LEVEL
@@ -101,6 +95,6 @@ spec: @@ -101,6 +95,6 @@ spec:
101 volumes: 95 volumes:
102 - name: accesslogs 96 - name: accesslogs
103 emptyDir: {} 97 emptyDir: {}
104 - - name: mmmjihuitest2-pvc1 98 + - name: mmmjihuitest-pvc1
105 persistentVolumeClaim: 99 persistentVolumeClaim:
106 - claimName: mmmjihuitest2-pvc  
  100 + claimName: mmmjihuitest-pvc