opensource/sealos
3
0
Fork 0
mirror of https://github.com/labring/sealos.git synced 2026-09-24 15:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix controller ingress label override. (#4597)

Browse Source 
Signed-off-by: zzjin <tczzjin@gmail.com>
This commit is contained in:
zzjin
2024-03-15 15:46:09 +08:00
committed by GitHub
parent 1eafe70326
commit 5c73e629fd
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/db/adminer/controllers/adminer_controller.go
-1
View File
@@ -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
controllers/terminal/controllers/terminal_controller.go
-1
View File
@@ -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