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

yamls/zhichan/all-ingress.yaml

@@ -1192,5 +1192,20 @@ spec:
         backend:
           serviceName: fktaxctl-service
           servicePort: 80
+---         
           
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: center-channel-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: gsb.qifu.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: center-channel-service
+          servicePort: 80        
 

yamls/zhichan/center-app-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: center-app
+  namespace: chaolai
+  labels:
+    app: center-app
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: center-app
+  template:
+    metadata:
+      labels:
+        app: center-app
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: center-app
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:90.0.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 80
+        env:
+        - name:  TZ
+          value: Asia/Shanghai
+        - name:  LANG
+          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:  CENTER_APP_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_APP_DB_NAME
+        - name:  CENTER_APP_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_APP_REDIS_DB
+        - name:  REDIS_HOST
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_HOST
+        - name:  REDIS_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PORT
+        - name:  REDIS_PWD
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PWD
+
+        - name:  NODE_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: center-app-service
+  name: center-app-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 19830
+  selector:
+      app: center-app

yamls/zhichan/center-channel-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: center-channel
+  namespace: chaolai
+  labels:
+    app: center-channel
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: center-channel
+  template:
+    metadata:
+      labels:
+        app: center-channel
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: center-channel
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:80.0.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 80
+        env:
+        - name:  TZ
+          value: Asia/Shanghai
+        - name:  LANG
+          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:  CENTER_CHANNEL_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_CHANNEL_DB_NAME
+        - name:  CENTER_CHANNEL_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_CHANNEL_REDIS_DB
+        - name:  REDIS_HOST
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_HOST
+        - name:  REDIS_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PORT
+        - name:  REDIS_PWD
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PWD
+
+        - name:  NODE_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: center-channel-service
+  name: center-channel-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 19810
+  selector:
+      app: center-channel

yamls/zhichan/igirl-web-deployment.yaml

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

yamls/zhichan/zhichanconfigmap.yaml

@@ -65,16 +65,16 @@ data:
   XGGPJB_REDIS_DB: "3"
   JIAXIYA_REDIS_DB: "12"
   JIAXIYA_DB_NAME: jiaxiya
-
   FK_REDIS_DB: "2"
   FK_DB_NAME: fktaxctl
-
   FK_DB_HOST: rm-2ze0820457l27e12090130.mysql.rds.aliyuncs.com
   FK_DB_PORT: "3306"
   FK_DB_USER: caishui
   FK_DB_PWD: jvmfTVDuG5YE(*Z
-
   FK_REDIS_HOST: r-2zejem2xk438n71rny.redis.rds.aliyuncs.com
   FK_REDIS_PORT: "6379"
   FK_REDIS_PWD: yo#@eXz9EMpa+5O
-
+  CENTER_CHANNEL_DB_NAME: center_channel
+  CENTER_CHANNEL_REDIS_DB: "8"
+  CENTER_APP_DB_NAME: center_app
+  CENTER_APP_REDIS_DB: "7"