Merge pull request #4284 from RolandMa1986/fix-ingress

update ingress version in ks-core chart

config/ks-core/templates/ks-apiserver.yml

@@ -41,14 +41,13 @@ spec:
         resources:
           {{- toYaml .Values.apiserver.resources | nindent 12 }}
         volumeMounts:
-        - mountPath: /var/run/docker.sock
-          name: docker-sock
         - mountPath: /etc/kubesphere/ingress-controller
           name: ks-router-config
         - mountPath: /etc/kubesphere/
           name: kubesphere-config
         - mountPath: /etc/localtime
           name: host-time
+          readOnly: true
         {{- if .Values.apiserver.extraVolumeMounts }}
           {{- toYaml .Values.apiserver.extraVolumeMounts | nindent 8 }}
         {{- end }}
@@ -93,10 +92,6 @@ spec:
             - {{ .Release.Namespace }}
 {{- end }}
       volumes:
-      - hostPath:
-          path: /var/run/docker.sock
-          type: ""
-        name: docker-sock
       - configMap:
           defaultMode: 420
           name: ks-router-config

config/ks-core/templates/ks-console.yml

@@ -36,6 +36,7 @@ spec:
           name: sample-bookinfo
         - mountPath: /etc/localtime
           name: host-time
+          readOnly: true
         {{- if .Values.console.extraVolumeMounts }}
           {{- toYaml .Values.console.extraVolumeMounts | nindent 8 }}
         {{- end }}

config/ks-core/templates/ks-controller-manager.yaml

@@ -52,6 +52,7 @@ spec:
           name: webhook-secret
         - mountPath: /etc/localtime
           name: host-time
+          readOnly: true
         {{- if .Values.controller.extraVolumeMounts }}
           {{- toYaml .Values.controller.extraVolumeMounts | nindent 8 }}
         {{- end }}

config/ks-core/templates/sample-bookinfo-configmap.yaml

@@ -355,7 +355,7 @@ data:
           targetPort: 9080
 
     ---
-    apiVersion: extensions/v1beta1
+    apiVersion: networking.k8s.io/v1
     kind: Ingress
     metadata:
       namespace: servicemesh
@@ -367,10 +367,13 @@ data:
       rules:
         - http:
             paths:
-              - path: /
-                backend:
-                  serviceName: productpage
-                  servicePort: 9080
+            - backend:
+                service:
+                  name: productpage
+                  port:
+                    number: 9080
+              path: /
+              pathType: ImplementationSpecific
           host: productpage.servicemesh.139.198.121.92.nip.io
 kind: ConfigMap
 metadata: