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

yamls/dashboard-admin.yaml

@@ -12,3 +12,6 @@ subjects:
 - kind: ServiceAccount
   name: kubernetes-dashboard
   namespace: kube-system
+
+
+

yamls/kong/kong-db.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: kong-dbservice
+  namespace: kong
+spec:
+  type: NodePort
+  ports:
+  - name: kong-dbservice
+    port: 5432
+    targetPort: 5432
+    protocol: TCP
+  selector:
+    app: kong-db
+---
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: kong-db
+  namespace: kong
+spec:
+  template:
+    metadata:
+      labels:
+        name: kong-db
+        app: kong-db
+    spec:
+      containers:
+      - name: kong-db
+        image: postgres:9.6
+        env:
+        - name:  POSTGRES_USER
+          value: kong
+        - name:  POSTGRES_DB
+          value: kong
+        - name:  POSTGRES_PASSWORD
+          value: 123456
+        ports:
+        - name: tcp
+          containerPort: 5432
+          protocol: TCP

yamls/zhichan/fktaxctl-deployment.yaml

@@ -21,7 +21,7 @@ spec:
           emptyDir: {}
       containers:
       - name: fktaxctl
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:99.0.61
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:99.0.62
         volumeMounts:
           - name: shared-data
             mountPath: /tmp