From 782e45c2658925afa22c518a4b9e65539738c3b7 Mon Sep 17 00:00:00 2001 From: suyuee Date: Tue, 7 Nov 2023 20:47:50 -0800 Subject: [PATCH 1/3] disable --- pkg/yurtmanager/controller/controller.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/yurtmanager/controller/controller.go b/pkg/yurtmanager/controller/controller.go index aaf66932148..75bdd0176ea 100644 --- a/pkg/yurtmanager/controller/controller.go +++ b/pkg/yurtmanager/controller/controller.go @@ -27,7 +27,6 @@ import ( "github.com/openyurtio/openyurt/cmd/yurt-manager/app/config" "github.com/openyurtio/openyurt/cmd/yurt-manager/names" - "github.com/openyurtio/openyurt/pkg/yurtmanager/controller/csrapprover" "github.com/openyurtio/openyurt/pkg/yurtmanager/controller/daemonpodupdater" "github.com/openyurtio/openyurt/pkg/yurtmanager/controller/nodepool" "github.com/openyurtio/openyurt/pkg/yurtmanager/controller/platformadmin" @@ -73,7 +72,6 @@ func NewControllerInitializers() map[string]InitFunc { controllers[name] = fn } - register(names.CsrApproverController, csrapprover.Add) register(names.DaemonPodUpdaterController, daemonpodupdater.Add) register(names.DelegateLeaseController, delegatelease.Add) register(names.PodBindingController, podbinding.Add) From 065fa736953f3196dd7f20385218a61813812865 Mon Sep 17 00:00:00 2001 From: suyuee Date: Wed, 13 Dec 2023 10:20:34 -0800 Subject: [PATCH 2/3] fix --- pkg/yurtmanager/controller/raven/dns/dns_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/yurtmanager/controller/raven/dns/dns_controller.go b/pkg/yurtmanager/controller/raven/dns/dns_controller.go index 17eb950e7c7..ea30dd5cc91 100644 --- a/pkg/yurtmanager/controller/raven/dns/dns_controller.go +++ b/pkg/yurtmanager/controller/raven/dns/dns_controller.go @@ -161,7 +161,7 @@ func (r *ReconcileDns) Reconcile(ctx context.Context, req reconcile.Request) (re func (r ReconcileDns) getProxyDNS(ctx context.Context, objKey client.ObjectKey) (*corev1.ConfigMap, error) { var cm corev1.ConfigMap err := wait.PollImmediate(5*time.Second, time.Minute, func() (done bool, err error) { - err = r.Client.Get(ctx, objKey, &cm) + err = r.Client.Get(ctx, objKey, cm) if err != nil { if apierrors.IsNotFound(err) { err = r.buildRavenDNSConfigMap() From 508371593feaaa88b753a7cbf3cffa20887175b6 Mon Sep 17 00:00:00 2001 From: suyuee Date: Wed, 13 Dec 2023 10:23:28 -0800 Subject: [PATCH 3/3] fix --- pkg/yurtmanager/controller/raven/dns/dns_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/yurtmanager/controller/raven/dns/dns_controller.go b/pkg/yurtmanager/controller/raven/dns/dns_controller.go index ea30dd5cc91..17eb950e7c7 100644 --- a/pkg/yurtmanager/controller/raven/dns/dns_controller.go +++ b/pkg/yurtmanager/controller/raven/dns/dns_controller.go @@ -161,7 +161,7 @@ func (r *ReconcileDns) Reconcile(ctx context.Context, req reconcile.Request) (re func (r ReconcileDns) getProxyDNS(ctx context.Context, objKey client.ObjectKey) (*corev1.ConfigMap, error) { var cm corev1.ConfigMap err := wait.PollImmediate(5*time.Second, time.Minute, func() (done bool, err error) { - err = r.Client.Get(ctx, objKey, cm) + err = r.Client.Get(ctx, objKey, &cm) if err != nil { if apierrors.IsNotFound(err) { err = r.buildRavenDNSConfigMap()