From ad517568bf33b682c4faf75a70d9653924ed7b94 Mon Sep 17 00:00:00 2001 From: Sanjana Lawande Date: Tue, 4 Jun 2024 12:08:05 -0700 Subject: [PATCH 1/3] Adding logging for pullsecret controller --- pkg/operator/controllers/pullsecret/pullsecret_controller.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller.go b/pkg/operator/controllers/pullsecret/pullsecret_controller.go index b90400df1d1..e606a066ecb 100644 --- a/pkg/operator/controllers/pullsecret/pullsecret_controller.go +++ b/pkg/operator/controllers/pullsecret/pullsecret_controller.go @@ -184,15 +184,18 @@ func (r *Reconciler) ensureGlobalPullSecret(ctx context.Context, operatorSecret, // allows for simpler logic flow, when delete and create are not handled separately // this call happens only when there is a need to change, it has no significant impact on performance err := r.client.Delete(ctx, secret) + r.log.Info("Pullsecret Not Found, Creating Again") if err != nil && !kerrors.IsNotFound(err) { return nil, err } err = r.client.Create(ctx, secret) + r.log.Info("Pullsecret Created") return secret, err } err = r.client.Update(ctx, secret) + r.log.Info("Updating Existing Pullsecret") return secret, err } From a7248b4dc00720936030ec75ef17a55558bc9189 Mon Sep 17 00:00:00 2001 From: Sanjana Lawande Date: Tue, 11 Jun 2024 10:29:07 -0700 Subject: [PATCH 2/3] Fixing unit tests --- .../controllers/pullsecret/pullsecret_controller.go | 10 +++++++--- .../pullsecret/pullsecret_controller_test.go | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller.go b/pkg/operator/controllers/pullsecret/pullsecret_controller.go index e606a066ecb..05f7e070dbe 100644 --- a/pkg/operator/controllers/pullsecret/pullsecret_controller.go +++ b/pkg/operator/controllers/pullsecret/pullsecret_controller.go @@ -184,18 +184,22 @@ func (r *Reconciler) ensureGlobalPullSecret(ctx context.Context, operatorSecret, // allows for simpler logic flow, when delete and create are not handled separately // this call happens only when there is a need to change, it has no significant impact on performance err := r.client.Delete(ctx, secret) - r.log.Info("Pullsecret Not Found, Creating Again") + r.log.Info("Global Pull secret Not Found, Creating Again") if err != nil && !kerrors.IsNotFound(err) { return nil, err } err = r.client.Create(ctx, secret) - r.log.Info("Pullsecret Created") + if err == nil { + r.log.Info("Global Pull secret Created") + } return secret, err } err = r.client.Update(ctx, secret) - r.log.Info("Updating Existing Pullsecret") + if err == nil { + r.log.Info("Updating Existing Global Pull secret") + } return secret, err } diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go b/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go index 4d02241b837..8be8b80bde3 100644 --- a/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go +++ b/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go @@ -768,6 +768,7 @@ func TestEnsureGlobalPullSecret(t *testing.T) { r := &Reconciler{ client: clientBuilder.Build(), + log: logrus.NewEntry(logrus.StandardLogger()), } s, err := r.ensureGlobalPullSecret(ctx, tt.operatorPullSecret, tt.pullSecret) From c0f8f35b418c90c24baba9d148be3673923d02dc Mon Sep 17 00:00:00 2001 From: Sanjana Lawande Date: Tue, 11 Jun 2024 21:17:50 -0700 Subject: [PATCH 3/3] changing updating to updated --- pkg/operator/controllers/pullsecret/pullsecret_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller.go b/pkg/operator/controllers/pullsecret/pullsecret_controller.go index 05f7e070dbe..c57d84c3cbb 100644 --- a/pkg/operator/controllers/pullsecret/pullsecret_controller.go +++ b/pkg/operator/controllers/pullsecret/pullsecret_controller.go @@ -198,7 +198,7 @@ func (r *Reconciler) ensureGlobalPullSecret(ctx context.Context, operatorSecret, err = r.client.Update(ctx, secret) if err == nil { - r.log.Info("Updating Existing Global Pull secret") + r.log.Info("Updated Existing Global Pull secret") } return secret, err }