From 5ad7d167882a2c5a7e7ab80ad39ee8866b9e383a Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Sun, 26 Sep 2021 07:36:52 +0000 Subject: [PATCH 1/2] update ingress version in ks-core chart Signed-off-by: Roland.Ma --- config/ks-core/templates/ks-apiserver.yml | 2 ++ config/ks-core/templates/ks-console.yml | 1 + config/ks-core/templates/ks-controller-manager.yaml | 1 + .../templates/sample-bookinfo-configmap.yaml | 13 ++++++++----- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config/ks-core/templates/ks-apiserver.yml b/config/ks-core/templates/ks-apiserver.yml index 14dff7540..abff4e00d 100644 --- a/config/ks-core/templates/ks-apiserver.yml +++ b/config/ks-core/templates/ks-apiserver.yml @@ -43,12 +43,14 @@ spec: volumeMounts: - mountPath: /var/run/docker.sock name: docker-sock + readOnly: true - 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 }} diff --git a/config/ks-core/templates/ks-console.yml b/config/ks-core/templates/ks-console.yml index 05160e122..ffab2eee5 100644 --- a/config/ks-core/templates/ks-console.yml +++ b/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 }} diff --git a/config/ks-core/templates/ks-controller-manager.yaml b/config/ks-core/templates/ks-controller-manager.yaml index df7de63af..7482b40a7 100644 --- a/config/ks-core/templates/ks-controller-manager.yaml +++ b/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 }} diff --git a/config/ks-core/templates/sample-bookinfo-configmap.yaml b/config/ks-core/templates/sample-bookinfo-configmap.yaml index 8b6267731..076022be9 100644 --- a/config/ks-core/templates/sample-bookinfo-configmap.yaml +++ b/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: From fb2e557baaacf3d89095c88d339bbfc0e34f6c5f Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Mon, 27 Sep 2021 03:23:42 +0000 Subject: [PATCH 2/2] remove docker mount Signed-off-by: Roland.Ma --- config/ks-core/templates/ks-apiserver.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/ks-core/templates/ks-apiserver.yml b/config/ks-core/templates/ks-apiserver.yml index abff4e00d..283acc9a8 100644 --- a/config/ks-core/templates/ks-apiserver.yml +++ b/config/ks-core/templates/ks-apiserver.yml @@ -41,9 +41,6 @@ spec: resources: {{- toYaml .Values.apiserver.resources | nindent 12 }} volumeMounts: - - mountPath: /var/run/docker.sock - name: docker-sock - readOnly: true - mountPath: /etc/kubesphere/ingress-controller name: ks-router-config - mountPath: /etc/kubesphere/ @@ -95,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