Merge pull request #4618 from RolandMa1986/helm-clear

Remove unused helm template

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"

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

config/ks-core/templates/ks-router-cm.yaml

@@ -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" . }}

config/ks-core/templates/ks-router-config.tpl

@@ -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 }}

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"