From 17138c8b5a282d7f65fe36eff5a4878084fcd73d Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Thu, 13 Jan 2022 08:25:45 +0000 Subject: [PATCH] remove unused helm template Signed-off-by: Roland.Ma --- config/ks-core/Chart.yaml | 4 +- config/ks-core/templates/ks-apiserver.yml | 6 -- config/ks-core/templates/ks-router-cm.yaml | 9 -- config/ks-core/templates/ks-router-config.tpl | 96 ------------------- config/ks-core/values.yaml | 2 +- 5 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 config/ks-core/templates/ks-router-cm.yaml delete mode 100644 config/ks-core/templates/ks-router-config.tpl diff --git a/config/ks-core/Chart.yaml b/config/ks-core/Chart.yaml index 2b7d26501..601dc1333 100644 --- a/config/ks-core/Chart.yaml +++ b/config/ks-core/Chart.yaml @@ -7,9 +7,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "v3.2.0" +appVersion: "v3.2.1" diff --git a/config/ks-core/templates/ks-apiserver.yml b/config/ks-core/templates/ks-apiserver.yml index c3cfdb990..77e9691bc 100644 --- a/config/ks-core/templates/ks-apiserver.yml +++ b/config/ks-core/templates/ks-apiserver.yml @@ -41,8 +41,6 @@ spec: resources: {{- toYaml .Values.apiserver.resources | nindent 12 }} volumeMounts: - - mountPath: /etc/kubesphere/ingress-controller - name: ks-router-config - mountPath: /etc/kubesphere/ name: kubesphere-config - mountPath: /etc/localtime @@ -77,10 +75,6 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} volumes: - - configMap: - defaultMode: 420 - name: ks-router-config - name: ks-router-config - configMap: defaultMode: 420 name: kubesphere-config diff --git a/config/ks-core/templates/ks-router-cm.yaml b/config/ks-core/templates/ks-router-cm.yaml deleted file mode 100644 index 045019143..000000000 --- a/config/ks-core/templates/ks-router-cm.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: ks-router-config -data: - ingress-controller-svc.yaml: |+ -{{- include "ingress-controller-svc.yaml" . }} - ingress-controller.yaml: | -{{- include "ingress-controller.yaml" . }} \ No newline at end of file diff --git a/config/ks-core/templates/ks-router-config.tpl b/config/ks-core/templates/ks-router-config.tpl deleted file mode 100644 index 8674ec82a..000000000 --- a/config/ks-core/templates/ks-router-config.tpl +++ /dev/null @@ -1,96 +0,0 @@ -{{/* vim: set filetype=mustache: */}} - -{{- define "ingress-controller.yaml" }} - apiVersion: apps/v1 - kind: Deployment - metadata: - name: ks-router - spec: - replicas: 1 - selector: - matchLabels: - app: kubesphere - component: ks-router - tier: backend - template: - metadata: - labels: - app: kubesphere - component: ks-router - tier: backend - annotations: - prometheus.io/port: '10254' - prometheus.io/scrape: 'true' - spec: - serviceAccountName: kubesphere-router-serviceaccount - containers: - - name: nginx-ingress-controller - image: {{ .Values.image.nginx_ingress_controller_repo }}:{{ .Values.image.nginx_ingress_controller_tag | default .Chart.AppVersion}} - args: - - /nginx-ingress-controller - - --default-backend-service=$(POD_NAMESPACE)/default-http-backend - - --annotations-prefix=nginx.ingress.kubernetes.io - - --update-status - - --update-status-on-shutdown - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - ports: - - name: http - containerPort: 80 - - name: https - containerPort: 443 - livenessProbe: - failureThreshold: 3 - httpGet: - path: /healthz - port: 10254 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - readinessProbe: - failureThreshold: 3 - httpGet: - path: /healthz - port: 10254 - scheme: HTTP - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - securityContext: - runAsNonRoot: false -{{- end }} - -{{- define "ingress-controller-svc.yaml" }} - apiVersion: v1 - kind: Service - metadata: - name: kubesphere-router-gateway - labels: - app: kubesphere - component: ks-router - tier: backend - spec: - selector: - app: kubesphere - component: ks-router - tier: backend - type: LoadBalancer - ports: - - name: http - protocol: TCP - port: 80 - targetPort: 80 - - name: https - protocol: TCP - port: 443 - targetPort: 443 -{{- end }} \ No newline at end of file diff --git a/config/ks-core/values.yaml b/config/ks-core/values.yaml index 9d7a13cc3..0e3dc6233 100644 --- a/config/ks-core/values.yaml +++ b/config/ks-core/values.yaml @@ -16,7 +16,7 @@ image: ks_kubectl_tag: "" nginx_ingress_controller_repo: kubesphere/nginx-ingress-controller - nginx_ingress_controller_tag: "v0.35.0" + nginx_ingress_controller_tag: "v1.1.0" defaultbackend_repo: "mirrorgooglecontainers/defaultbackend-amd64" defaultbackend_tag: "1.4"