Merge pull request #4551 from chaunceyjiang/fix_4548

upgrade ingress nginx version

build/ks-controller-manager/Dockerfile

@@ -9,7 +9,7 @@ ARG TARGETARCH
 ARG TARGETOS
 ARG HELM_VERSION=v3.5.2
 ARG KUSTOMIZE_VERSION=v4.2.0
-ARG INGRESS_NGINX_VERSION=3.35.0
+ARG INGRESS_NGINX_VERSION=4.0.13
 
 ENV OUTDIR=/out
 RUN mkdir -p ${OUTDIR}/usr/local/bin

config/gateway/templates/nginx-ingress.yaml

@@ -11,7 +11,7 @@ spec:
     {{- with .Values.controller.image }}
     {{- toYaml . | nindent 6 }}
     {{- end }}
-
+    watchIngressWithoutClass: true
     publishService:
       enabled: {{ eq .Values.service.type "LoadBalancer" }}
 

config/gateway/values.yaml

@@ -12,7 +12,7 @@ controller:
     namespace: ""  # defaults to .Release.Namespace
   image:
     repository: kubesphere/nginx-ingress-controller
-    tag: "v0.48.1"
+    tag: "v1.1.0"
     pullPolicy: IfNotPresent
     digest: ""
 

pkg/controller/helm/helm_controller.go

@@ -59,7 +59,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 		r, err := reconciler.New(
 			reconciler.WithChart(*w.Chart),
 			reconciler.WithGroupVersionKind(w.GroupVersionKind),
-			reconciler.WithOverrideValues(r.defaultConfiguration()),
+			reconciler.WithOverrideValues(r.defaultConfiguration(w.OverrideValues)),
 			reconciler.SkipDependentWatches(w.WatchDependentResources != nil && !*w.WatchDependentResources),
 			reconciler.WithMaxConcurrentReconciles(maxConcurrentReconciles),
 			reconciler.WithReconcilePeriod(reconcilePeriod),
@@ -78,8 +78,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return nil
 }
 
-func (r *Reconciler) defaultConfiguration() map[string]string {
-	var overrideValues = make(map[string]string)
+func (r *Reconciler) defaultConfiguration(overrideValues map[string]string) map[string]string {
 	if r.GatewayOptions.Repository != "" {
 		overrideValues["controller.image.repository"] = r.GatewayOptions.Repository
 	}