allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 1e1d67ab9316b38029e670fcf1b53bb19f66f27b 1 个父辈 91e4d50f

调整配置

内嵌 并排对比
正在显示 2 个修改的文件 包含 156 行增加 和 154 行删除
@@ -7,12 +7,12 @@ metadata: @@ -7,12 +7,12 @@ metadata:
7 k8s-app: performance-back 7 k8s-app: performance-back
8 spec: 8 spec:
9 ports: 9 ports:
10 - - name: "http"  
11 - port: 80  
12 - targetPort: 8082  
13 - - name: "https"  
14 - port: 443  
15 - targetPort: 443 10 + - name: "http"
  11 + port: 80
  12 + targetPort: 8082
  13 + - name: "https"
  14 + port: 443
  15 + targetPort: 443
16 selector: 16 selector:
17 k8s-app: performance-back 17 k8s-app: performance-back
18 --- 18 ---
@@ -46,77 +46,78 @@ spec: @@ -46,77 +46,78 @@ spec:
46 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb 46 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
47 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy 47 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
48 containers: 48 containers:
49 - - name: performance-back  
50 - image: 192.168.0.243:5000/mmm/performance-back:master  
51 - imagePullPolicy: Always  
52 - ports:  
53 - - containerPort: 8082  
54 - - containerPort: 443  
55 - volumeMounts:  
56 - - mountPath: /opt/logs  
57 - name: accesslogs  
58 - env:  
59 - - name: LOG_LEVEL  
60 - value: "debug"  
61 - - name: LOG_FILE  
62 - value: "true"  
63 - - name: ENV_MOD  
64 - value: "prd"  
65 - - name: ERROR_BASE_CODE  
66 - value: "1"  
67 - - name: ERROR_BASE_CODE_MULTIPLE  
68 - value: "1000"  
69 - - name: POSTGRESQL_DB_NAME  
70 - value: "performance_prd"  
71 - - name: ENABLE_HTTPS  
72 - value: "true"  
73 - - name: POSTGRESQL_USER  
74 - valueFrom:  
75 - configMapKeyRef:  
76 - name: suplus-config  
77 - key: postgresql.user  
78 - - name: POSTGRESQL_PASSWORD  
79 - valueFrom:  
80 - configMapKeyRef:  
81 - name: suplus-config  
82 - key: postgresql.password  
83 - - name: POSTGRESQL_HOST  
84 - valueFrom:  
85 - configMapKeyRef:  
86 - name: suplus-config  
87 - key: postgresql.host  
88 - - name: POSTGRESQL_PORT  
89 - valueFrom:  
90 - configMapKeyRef:  
91 - name: suplus-config  
92 - key: postgresql.port  
93 - - name: REDIS_HOST  
94 - valueFrom:  
95 - configMapKeyRef:  
96 - name: suplus-config  
97 - key: redis.ip  
98 - - name: REDIS_PORT  
99 - valueFrom:  
100 - configMapKeyRef:  
101 - name: suplus-config  
102 - key: redis.port  
103 - - name: KAFKA_HOSTS  
104 - valueFrom:  
105 - configMapKeyRef:  
106 - name: suplus-config  
107 - key: kafka.host  
108 - - name: KAFKA_PERFORMANCE_ID  
109 - valueFrom:  
110 - configMapKeyRef:  
111 - name: suplus-config  
112 - key: kafkaperformance.id  
113 - - name: KAFKA_BUSINESS_TOPIC  
114 - value: "mmm_business_prd"  
115 - - name: UCENTER_SERVICE_HOST  
116 - value: "https://suplus-ucenter-prd.fjmaimaimai.com"  
117 - - name: BUSINESS_ADMIN_SERVICE_HOST  
118 - value: "https://suplus-business-admin-prd.fjmaimaimai.com" 49 + - name: performance-back
  50 + image: 192.168.0.243:5000/mmm/performance-back:master
  51 + imagePullPolicy: Always
  52 + ports:
  53 + - containerPort: 8082
  54 + - containerPort: 443
  55 + volumeMounts:
  56 + - mountPath: /opt/logs
  57 + name: accesslogs
  58 + env:
  59 + - name: LOG_LEVEL
  60 + value: "debug"
  61 + - name: LOG_FILE
  62 + value: "true"
  63 + - name: ENV_MOD
  64 + value: "prd"
  65 + - name: ERROR_BASE_CODE
  66 + value: "1"
  67 + - name: ERROR_BASE_CODE_MULTIPLE
  68 + value: "1000"
  69 + - name: POSTGRESQL_DB_NAME
  70 + value: "performance_prd"
  71 + - name: ENABLE_HTTPS
  72 + value: "true"
  73 + - name: POSTGRESQL_USER
  74 + valueFrom:
  75 + configMapKeyRef:
  76 + name: suplus-config
  77 + key: postgresql.user
  78 + - name: POSTGRESQL_PASSWORD
  79 + valueFrom:
  80 + configMapKeyRef:
  81 + name: suplus-config
  82 + key: postgresql.password
  83 + - name: POSTGRESQL_HOST
  84 + valueFrom:
  85 + configMapKeyRef:
  86 + name: suplus-config
  87 + key: postgresql.host
  88 + - name: POSTGRESQL_PORT
  89 + valueFrom:
  90 + configMapKeyRef:
  91 + name: suplus-config
  92 + key: postgresql.port
  93 + - name: REDIS_HOST
  94 + valueFrom:
  95 + configMapKeyRef:
  96 + name: suplus-config
  97 + key: redis.ip
  98 + - name: REDIS_PORT
  99 + valueFrom:
  100 + configMapKeyRef:
  101 + name: suplus-config
  102 + key: redis.port
  103 + - name: KAFKA_HOSTS
  104 + valueFrom:
  105 + configMapKeyRef:
  106 + name: suplus-config
  107 + key: kafka.host
  108 + - name: KAFKA_PERFORMANCE_ID
  109 + valueFrom:
  110 + configMapKeyRef:
  111 + name: suplus-config
  112 + key: kafkaperformance.id
  113 + - name: KAFKA_BUSINESS_TOPIC
  114 + value: "mmm_business_prd"
  115 + - name: UCENTER_SERVICE_HOST
  116 + value: "https://suplus-ucenter-prd.fjmaimaimai.com"
  117 + - name: BUSINESS_ADMIN_SERVICE_HOST
  118 + value: "https://suplus-business-admin-prd.fjmaimaimai.com"
  119 + - name: MMM_OPEN_API_SERVICE_HOST
  120 + value: "https://public-interface.fjmaimaimai.com/openapi"
119 volumes: 121 volumes:
120 - name: accesslogs 122 - name: accesslogs
121 emptyDir: {} 123 emptyDir: {}
122 -  
@@ -7,12 +7,12 @@ metadata: @@ -7,12 +7,12 @@ metadata:
7 k8s-app: performance-back 7 k8s-app: performance-back
8 spec: 8 spec:
9 ports: 9 ports:
10 - - name: "http"  
11 - port: 80  
12 - targetPort: 8082  
13 - - name: "https"  
14 - port: 443  
15 - targetPort: 443 10 + - name: "http"
  11 + port: 80
  12 + targetPort: 8082
  13 + - name: "https"
  14 + port: 443
  15 + targetPort: 443
16 selector: 16 selector:
17 k8s-app: performance-back 17 k8s-app: performance-back
18 --- 18 ---
@@ -46,77 +46,78 @@ spec: @@ -46,77 +46,78 @@ spec:
46 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb 46 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
47 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy 47 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
48 containers: 48 containers:
49 - - name: performance-back  
50 - image: 192.168.0.243:5000/mmm/performance-back:dev  
51 - imagePullPolicy: Always  
52 - ports:  
53 - - containerPort: 8082  
54 - - containerPort: 443  
55 - volumeMounts:  
56 - - mountPath: /opt/logs  
57 - name: accesslogs  
58 - env:  
59 - - name: LOG_LEVEL  
60 - value: "debug"  
61 - - name: LOG_FILE  
62 - value: "true"  
63 - - name: ENV_MOD  
64 - value: "test"  
65 - - name: ERROR_BASE_CODE  
66 - value: "1"  
67 - - name: ERROR_BASE_CODE_MULTIPLE  
68 - value: "1000"  
69 - - name: POSTGRESQL_DB_NAME  
70 - value: "performance_test"  
71 - - name: ENABLE_HTTPS  
72 - value: "true"  
73 - - name: POSTGRESQL_USER  
74 - valueFrom:  
75 - configMapKeyRef:  
76 - name: suplus-config  
77 - key: postgresql.user  
78 - - name: POSTGRESQL_PASSWORD  
79 - valueFrom:  
80 - configMapKeyRef:  
81 - name: suplus-config  
82 - key: postgresql.password  
83 - - name: POSTGRESQL_HOST  
84 - valueFrom:  
85 - configMapKeyRef:  
86 - name: suplus-config  
87 - key: postgresql.host  
88 - - name: POSTGRESQL_PORT  
89 - valueFrom:  
90 - configMapKeyRef:  
91 - name: suplus-config  
92 - key: postgresql.port  
93 - - name: REDIS_HOST  
94 - valueFrom:  
95 - configMapKeyRef:  
96 - name: suplus-config  
97 - key: redis.ip  
98 - - name: REDIS_PORT  
99 - valueFrom:  
100 - configMapKeyRef:  
101 - name: suplus-config  
102 - key: redis.port  
103 - - name: KAFKA_HOSTS  
104 - valueFrom:  
105 - configMapKeyRef:  
106 - name: suplus-config  
107 - key: kafka.host  
108 - - name: KAFKA_PERFORMANCE_ID  
109 - valueFrom:  
110 - configMapKeyRef:  
111 - name: suplus-config  
112 - key: kafkaperformance.id  
113 - - name: KAFKA_BUSINESS_TOPIC  
114 - value: "mmm_business_test"  
115 - - name: UCENTER_SERVICE_HOST  
116 - value: "https://suplus-ucenter-test.fjmaimaimai.com"  
117 - - name: BUSINESS_ADMIN_SERVICE_HOST  
118 - value: "https://suplus-business-admin-test.fjmaimaimai.com" 49 + - name: performance-back
  50 + image: 192.168.0.243:5000/mmm/performance-back:dev
  51 + imagePullPolicy: Always
  52 + ports:
  53 + - containerPort: 8082
  54 + - containerPort: 443
  55 + volumeMounts:
  56 + - mountPath: /opt/logs
  57 + name: accesslogs
  58 + env:
  59 + - name: LOG_LEVEL
  60 + value: "debug"
  61 + - name: LOG_FILE
  62 + value: "true"
  63 + - name: ENV_MOD
  64 + value: "test"
  65 + - name: ERROR_BASE_CODE
  66 + value: "1"
  67 + - name: ERROR_BASE_CODE_MULTIPLE
  68 + value: "1000"
  69 + - name: POSTGRESQL_DB_NAME
  70 + value: "performance_test"
  71 + - name: ENABLE_HTTPS
  72 + value: "true"
  73 + - name: POSTGRESQL_USER
  74 + valueFrom:
  75 + configMapKeyRef:
  76 + name: suplus-config
  77 + key: postgresql.user
  78 + - name: POSTGRESQL_PASSWORD
  79 + valueFrom:
  80 + configMapKeyRef:
  81 + name: suplus-config
  82 + key: postgresql.password
  83 + - name: POSTGRESQL_HOST
  84 + valueFrom:
  85 + configMapKeyRef:
  86 + name: suplus-config
  87 + key: postgresql.host
  88 + - name: POSTGRESQL_PORT
  89 + valueFrom:
  90 + configMapKeyRef:
  91 + name: suplus-config
  92 + key: postgresql.port
  93 + - name: REDIS_HOST
  94 + valueFrom:
  95 + configMapKeyRef:
  96 + name: suplus-config
  97 + key: redis.ip
  98 + - name: REDIS_PORT
  99 + valueFrom:
  100 + configMapKeyRef:
  101 + name: suplus-config
  102 + key: redis.port
  103 + - name: KAFKA_HOSTS
  104 + valueFrom:
  105 + configMapKeyRef:
  106 + name: suplus-config
  107 + key: kafka.host
  108 + - name: KAFKA_PERFORMANCE_ID
  109 + valueFrom:
  110 + configMapKeyRef:
  111 + name: suplus-config
  112 + key: kafkaperformance.id
  113 + - name: KAFKA_BUSINESS_TOPIC
  114 + value: "mmm_business_test"
  115 + - name: UCENTER_SERVICE_HOST
  116 + value: "https://suplus-ucenter-test.fjmaimaimai.com"
  117 + - name: BUSINESS_ADMIN_SERVICE_HOST
  118 + value: "https://suplus-business-admin-test.fjmaimaimai.com"
  119 + - name: MMM_OPEN_API_SERVICE_HOST
  120 + value: "http://mmm-open-api-dev.fjmaimaimai.com"
119 volumes: 121 volumes:
120 - name: accesslogs 122 - name: accesslogs
121 emptyDir: {} 123 emptyDir: {}
122 -