Merge branch 'master' of gitlab.gongsibao.com:jiangyong/k8syml

yamls/tx/biz/ic-name-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       restartPolicy: Always
       containers:
       containers:
       - name: ic-name
       - name: ic-name
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:700.0.3
+        image: csighub.tencentyun.com/brg_icp/brg-ic-name-check:386356ff
         imagePullPolicy: IfNotPresent
         imagePullPolicy: IfNotPresent
         ports:
         ports:
         - containerPort: 80
         - containerPort: 80
@@ -27,7 +27,61 @@ spec:
           value: Asia/Shanghai
           value: Asia/Shanghai
         - name:  LANG
         - name:  LANG
           value: zh_CN.UTF-8
           value: zh_CN.UTF-8
-
+        - name: APP_ENV
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: APP_ENV
+        - name: DB_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: DB_HOST
+        - name: DB_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: DB_PORT
+        - name: DB_PWD
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: DB_PWD
+        - name: DB_USER
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: DB_USER
+        - name: ES_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: ES_HOST
+        - name: ES_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: ES_PORT
+        - name: ES_PWD
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: ES_PWD
+        - name: ES_USER
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: ES_USER
+        - name: QCC_APPKEY
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: QCC_APPKEY
+        - name: QCC_SECRETKEY
+          valueFrom:
+            configMapKeyRef:
+              name: zhichan-config
+              key: QCC_SECRETKEY          
 ---
 ---
 
 
 kind: Service
 kind: Service
@@ -43,5 +97,4 @@ spec:
     - port: 80
     - port: 80
       targetPort: 80
       targetPort: 80
   selector:
   selector:
-      app: ic-name
-
+      app: ic-name
\ No newline at end of file

yamls/zhichan/all-ingress.yaml

@@ -45,6 +45,23 @@ spec:
               serviceName: bpoweb-service
               serviceName: bpoweb-service
               servicePort: 80
               servicePort: 80
 ---
 ---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: bpowx-ingress
+  namespace: chaolai
+spec:
+  rules:
+    - host: bpowx.gongsibao.com
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: bpoweb-service
+              servicePort: 80
+---
+
 apiVersion: extensions/v1beta1
 apiVersion: extensions/v1beta1
 kind: Ingress
 kind: Ingress
 metadata:
 metadata:

yamls/zhichan/bpo-web-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       restartPolicy: Always
       containers:
       containers:
       - name: bpoweb
       - name: bpoweb
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:8.1.39
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:8.1.42
         imagePullPolicy: IfNotPresent
         imagePullPolicy: IfNotPresent
         ports:
         ports:
         - containerPort: 80
         - containerPort: 80