From 5c73e629fd35c0b4ea3e2aa47e5ed1d2ae55e30e Mon Sep 17 00:00:00 2001 From: zzjin Date: Fri, 15 Mar 2024 15:46:09 +0800 Subject: [PATCH] Fix controller ingress label override. (#4597) Signed-off-by: zzjin --- controllers/db/adminer/controllers/adminer_controller.go | 1 - controllers/terminal/controllers/terminal_controller.go | 1 - 2 files changed, 2 deletions(-) diff --git a/controllers/db/adminer/controllers/adminer_controller.go b/controllers/db/adminer/controllers/adminer_controller.go index fca1c114c..74c7e94f5 100644 --- a/controllers/db/adminer/controllers/adminer_controller.go +++ b/controllers/db/adminer/controllers/adminer_controller.go @@ -438,7 +438,6 @@ func (r *AdminerReconciler) syncNginxIngress(ctx context.Context, adminer *admin } if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, ingress, func() error { expectIngress := r.createNginxIngress(adminer, host) - ingress.ObjectMeta.Labels = expectIngress.ObjectMeta.Labels ingress.ObjectMeta.Annotations = expectIngress.ObjectMeta.Annotations ingress.Spec.Rules = expectIngress.Spec.Rules ingress.Spec.TLS = expectIngress.Spec.TLS diff --git a/controllers/terminal/controllers/terminal_controller.go b/controllers/terminal/controllers/terminal_controller.go index 07fa0b90d..8707f5664 100644 --- a/controllers/terminal/controllers/terminal_controller.go +++ b/controllers/terminal/controllers/terminal_controller.go @@ -190,7 +190,6 @@ func (r *TerminalReconciler) syncNginxIngress(ctx context.Context, terminal *ter } if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, ingress, func() error { expectIngress := r.createNginxIngress(terminal, host) - ingress.ObjectMeta.Labels = expectIngress.ObjectMeta.Labels ingress.ObjectMeta.Annotations = expectIngress.ObjectMeta.Annotations ingress.Spec.Rules = expectIngress.Spec.Rules ingress.Spec.TLS = expectIngress.Spec.TLS