Merge branch 'yishujia-local-master' of http://gitlab.fjmaimaimai.com/mmm-go/ope…

…napi into yishujia-local-master

 #FROM 192.168.0.243:5000/mmm/mmmopp:20200110 as builder
+#FROM  192.168.0.243:5000/mmm/mmm-open-api:base
 FROM golang:1.13 as builder
 ENV GOPROXY https://goproxy.cn
 ENV GO111MODULE on

 #!/bin/bash
 export PATH=/root/local/bin:$PATH
-kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
+kubectl -n mmm-suplus-prd get pods | grep -q yishujia-open-api
 if [ "$?" == "1" ];then
-	kubectl create -f /tmp/prd/mmm-open-api/mmm-open-api.yaml --record
-	kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
+	kubectl create -f /tmp/prd/yishujia-open-api/yishujia-open-api.yaml --record
+	kubectl -n mmm-suplus-prd get svc | grep -q yishujia-open-api
 	if [ "$?" == "0" ];then
-		echo "mmm-open-api service install success!"
+		echo "yishujia-open-api service install success!"
 	else
-		echo "mmm-open-api service install fail!"
+		echo "yishujia-open-api service install fail!"
 	fi
-	kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
+	kubectl -n mmm-suplus-prd get pods | grep -q yishujia-open-api
 	if [ "$?" == "0" ];then
-		echo "mmm-open-api deployment install success!"
+		echo "yishujia-open-api deployment install success!"
 	else
-		echo "mmm-open-api deployment install fail!"
+		echo "yishujia-open-api deployment install fail!"
 	fi
 else
-	kubectl delete -f /tmp/prd/mmm-open-api/mmm-open-api.yaml
-	kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
+	kubectl delete -f /tmp/prd/yishujia-open-api/yishujia-open-api.yaml
+	kubectl -n mmm-suplus-prd get svc | grep -q yishujia-open-api
 	while [ "$?" == "0" ]
 	do
-	kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
+	kubectl -n mmm-suplus-prd get svc | grep -q yishujia-open-api
 	done
-	kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
+	kubectl -n mmm-suplus-prd get pods | grep -q yishujia-open-api
 	while [ "$?" == "0" ]
 	do
-	kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
+	kubectl -n mmm-suplus-prd get pods | grep -q yishujia-open-api
 	done
-	kubectl create -f /tmp/prd/mmm-open-api/mmm-open-api.yaml --record
-	kubectl -n mmm-suplus-prd get svc | grep -q mmm-open-api
+	kubectl create -f /tmp/prd/yishujia-open-api/yishujia-open-api.yaml --record
+	kubectl -n mmm-suplus-prd get svc | grep -q yishujia-open-api
 	if [ "$?" == "0" ];then
-		echo "mmm-open-api service update success!"
+		echo "yishujia-open-api service update success!"
 	else
-		echo "mmm-open-api service update fail!"
+		echo "yishujia-open-api service update fail!"
 	fi
-	kubectl -n mmm-suplus-prd get pods | grep -q mmm-open-api
+	kubectl -n mmm-suplus-prd get pods | grep -q yishujia-open-api
 	if [ "$?" == "0" ];then
-		echo "mmm-open-api deployment update success!"
+		echo "yishujia-open-api deployment update success!"
 	else
-		echo "mmm-open-api deployment update fail!"
+		echo "yishujia-open-api deployment update fail!"
 	fi
 fi
\ No newline at end of file

 apiVersion: v1
 kind: Service
 metadata:
-  name: mmm-open-api
+  name: yishujia-open-api
   namespace: mmm-suplus-prd
   labels:
-    k8s-app: mmm-open-api
+    k8s-app: yishujia-open-api
 spec:
   ports:
     - name: "http"
@@ -14,21 +14,21 @@ spec:
       port: 443
       targetPort: 443
   selector:
-    k8s-app: mmm-open-api
+    k8s-app: yishujia-open-api
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: mmm-open-api
+  name: yishujia-open-api
   namespace: mmm-suplus-prd
   labels:
-    k8s-app: mmm-open-api
+    k8s-app: yishujia-open-api
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        k8s-app: mmm-open-api
+        k8s-app: yishujia-open-api
     spec:
       affinity:
         nodeAffinity:
@@ -41,13 +41,10 @@ spec:
                   - key: kubernetes.io/hostname
                     operator: In
                     values:
-                      - cn-hangzhou.i-bp1djh1xn7taumbue1ze
-                      - cn-hangzhou.i-bp1djh1xn7taumbue1zd
-                      - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
-                      - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
+                      - cn-hangzhou.i-bp1inovcdp9uwwfusslx
       containers:
-        - name: mmm-open-api
-          image: 192.168.0.243:5000/mmm/mmm-open-api:master
+        - name: yishujia-open-api
+          image: 192.168.0.243:5000/mmm/yishujia-open-api:master
           imagePullPolicy: Always
           ports:
             - containerPort: 8080

+apiVersion: v1
+kind: Service
+metadata:
+  name: yishujia-open-api
+  namespace: mmm-suplus-prd
+  labels:
+    k8s-app: yishujia-open-api
+spec:
+  ports:
+    - name: "http"
+      port: 80
+      targetPort: 8080
+    - name: "https"
+      port: 443
+      targetPort: 443
+  selector:
+    k8s-app: yishujia-open-api
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: yishujia-open-api
+  namespace: mmm-suplus-prd
+  labels:
+    k8s-app: yishujia-open-api
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        k8s-app: yishujia-open-api
+    spec:
+      affinity:
+        nodeAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - preference: {}
+              weight: 100
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - cn-hangzhou.i-bp1inovcdp9uwwfusslx
+      containers:
+        - name: yishujia-open-api
+          image: 192.168.0.243:5000/mmm/yishujia-open-api:master
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8080
+            - containerPort: 443
+          env:
+            - name: MYSQL_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: mysql.host
+            - name: MYSQL_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: mysql.port
+            - name: REDIS_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: redis.ip
+            - name: REDIS_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: redis.port
+            - name: MYSQL_USER
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: mysql.user
+            - name: MYSQL_PASSWORD
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: mysql.password
+            - name: MYSQL_DB_NAME
+              value: "mmm_open"
+            - name: RUN_MODE
+              value: "prod"
+            - name: LOG_LEVEL
+              value: "debug"
+            - name: aliyun_logs_suplusfile
+              value: "stdout"
+            - name: aliyun_logs_access
+              value: " /opt/logs/app.log"
\ No newline at end of file