mmm-go / partner · 提交

转到一个项目

作者 yangfu
提交 6069860f51634c4499355c170188b0519db5bf59 2 个父辈 76b49d4e b8e9c1ab

Merge branch 'test' of http://gitlab.fjmaimaimai.com/mmm-go/partner into test

内嵌 并排对比
正在显示 2 个修改的文件 包含 29 行增加 和 39 行删除
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 partner 3 +kubectl -n mmm-suplus-test get pods | grep -q mmmpartner
4 if [ "$?" == "1" ];then 4 if [ "$?" == "1" ];then
5 kubectl create -f /tmp/test/partner/partner.yaml --record 5 kubectl create -f /tmp/test/partner/partner.yaml --record
6 - kubectl -n mmm-suplus-test get svc | grep -q partner 6 + kubectl -n mmm-suplus-test get svc | grep -q mmmpartner
7 if [ "$?" == "0" ];then 7 if [ "$?" == "0" ];then
8 - echo "partner service install success!" 8 + echo "mmmpartner service install success!"
9 else 9 else
10 - echo "partner service install fail!" 10 + echo "mmmpartner service install fail!"
11 fi 11 fi
12 - kubectl -n mmm-suplus-test get pods | grep -q partner 12 + kubectl -n mmm-suplus-test get pods | grep -q mmmpartner
13 if [ "$?" == "0" ];then 13 if [ "$?" == "0" ];then
14 - echo "partner deployment install success!" 14 + echo "mmmpartner deployment install success!"
15 else 15 else
16 - echo "partner deployment install fail!" 16 + echo "mmmpartner deployment install fail!"
17 fi 17 fi
18 else 18 else
19 kubectl delete -f /tmp/test/partner/partner.yaml 19 kubectl delete -f /tmp/test/partner/partner.yaml
20 - kubectl -n mmm-suplus-test get svc | grep -q partner 20 + kubectl -n mmm-suplus-test get svc | grep -q mmmpartner
21 while [ "$?" == "0" ] 21 while [ "$?" == "0" ]
22 do 22 do
23 - kubectl -n mmm-suplus-test get svc | grep -q partner 23 + kubectl -n mmm-suplus-test get svc | grep -q mmmpartner
24 done 24 done
25 - kubectl -n mmm-suplus-test get pods | grep -q partner 25 + kubectl -n mmm-suplus-test get pods | grep -q mmmpartner
26 while [ "$?" == "0" ] 26 while [ "$?" == "0" ]
27 do 27 do
28 - kubectl -n mmm-suplus-test get pods | grep -q partner 28 + kubectl -n mmm-suplus-test get pods | grep -q mmmpartner
29 done 29 done
30 kubectl create -f /tmp/test/partner/partner.yaml --record 30 kubectl create -f /tmp/test/partner/partner.yaml --record
31 - kubectl -n mmm-suplus-test get svc | grep -q partner 31 + kubectl -n mmm-suplus-test get svc | grep -q mmmpartner
32 if [ "$?" == "0" ];then 32 if [ "$?" == "0" ];then
33 - echo "partner service update success!" 33 + echo "mmmpartner service update success!"
34 else 34 else
35 - echo "partner service update fail!" 35 + echo "mmmpartner service update fail!"
36 fi 36 fi
37 - kubectl -n mmm-suplus-test get pods | grep -q partner 37 + kubectl -n mmm-suplus-test get pods | grep -q mmmpartner
38 if [ "$?" == "0" ];then 38 if [ "$?" == "0" ];then
39 - echo "partner deployment update success!" 39 + echo "mmmpartner deployment update success!"
40 else 40 else
41 - echo "partner deployment update fail!" 41 + echo "mmmpartner 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: partner 4 + name: mmmpartner
5 namespace: mmm-suplus-test 5 namespace: mmm-suplus-test
6 labels: 6 labels:
7 - k8s-app: partner 7 + k8s-app: mmmpartner
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: 8082
13 selector: 13 selector:
14 - k8s-app: partner 14 + k8s-app: mmmpartner
15 --- 15 ---
16 apiVersion: extensions/v1beta1 16 apiVersion: extensions/v1beta1
17 kind: Deployment 17 kind: Deployment
18 metadata: 18 metadata:
19 - name: partner 19 + name: mmmpartner
20 namespace: mmm-suplus-test 20 namespace: mmm-suplus-test
21 labels: 21 labels:
22 - k8s-app: partner 22 + k8s-app: mmmpartner
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: partner 28 + k8s-app: mmmpartner
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: partner  
47 - image: 192.168.0.243:5000/mmm/partner:test 46 + - name: mmmpartner
  47 + image: 192.168.0.243:5000/mmm/partner:dev
48 imagePullPolicy: Always 48 imagePullPolicy: Always
49 ports: 49 ports:
50 - containerPort: 8082 50 - containerPort: 8082
@@ -52,20 +52,10 @@ spec: @@ -52,20 +52,10 @@ spec:
52 - mountPath: /opt/logs 52 - mountPath: /opt/logs
53 name: accesslogs 53 name: accesslogs
54 env: 54 env:
55 - - name: REDIS_HOST  
56 - valueFrom:  
57 - configMapKeyRef:  
58 - name: suplus-config  
59 - key: redis.ip  
60 - - name: REDIS_PORT  
61 - valueFrom:  
62 - configMapKeyRef:  
63 - name: suplus-config  
64 - key: redis.port  
65 - name: HTTP_PORT 55 - name: HTTP_PORT
66 - value: "8082" 56 + value: "8082"
67 - name: POSTGRESQL_DB_NAME 57 - name: POSTGRESQL_DB_NAME
68 - value: "partner_test" 58 + value: "partner_dev"
69 - name: POSTGRESQL_USER 59 - name: POSTGRESQL_USER
70 value: "postgres" 60 value: "postgres"
71 - name: POSTGRESQL_PASSWORD 61 - name: POSTGRESQL_PASSWORD
@@ -81,9 +71,9 @@ spec: @@ -81,9 +71,9 @@ spec:
81 - name: ERROR_BASE_CODE_MULTIPLE 71 - name: ERROR_BASE_CODE_MULTIPLE
82 value: "1000" 72 value: "1000"
83 - name: ABILITY_SERVICE_HOST 73 - name: ABILITY_SERVICE_HOST
84 - value: "https://suplus-worth-app-gateway-test.fjmaimaimai.com" 74 + value: "https://suplus-worth-app-gateway-dev.fjmaimaimai.com"
85 - name: MMM_OPEN_API_SERVICE_HOST 75 - name: MMM_OPEN_API_SERVICE_HOST
86 - value: "http://mmm-open-api-test.fjmaimaimai.com" 76 + value: "http://mmm-open-api-dev.fjmaimaimai.com"
87 volumes: 77 volumes:
88 - name: accesslogs 78 - name: accesslogs
89 emptyDir: {} 79 emptyDir: {}