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

yamls/zhichan/all-ingress.yaml

@@ -504,6 +504,23 @@ spec:
 apiVersion: extensions/v1beta1
 apiVersion: extensions/v1beta1
 kind: Ingress
 kind: Ingress
 metadata:
 metadata:
+  name: igirl-58caishui-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: 58-caishui.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: igirl-service
+          servicePort: 80
+
+---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
   name: igirl-wangku-ingress
   name: igirl-wangku-ingress
   namespace: chaolai
   namespace: chaolai
 spec:
 spec:

yamls/zhichan/bpo-admin-deployment.yaml

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

yamls/zhichan/ent-profile-deployment.yaml

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

yamls/zhichan/fkrpt-result-deployment.yaml

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