From 2a7edddedecbb10fe7c07741fcf8054ece7560d5 Mon Sep 17 00:00:00 2001 From: Jian Zhu <36154065+zhujian7@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:58:42 +0800 Subject: [PATCH] Fix nil pointer panic (#157) Signed-off-by: zhujian Signed-off-by: zhujian --- pkg/spoke/apply/server_side_apply_test.go | 2 +- .../controllers/manifestcontroller/manifestwork_controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/spoke/apply/server_side_apply_test.go b/pkg/spoke/apply/server_side_apply_test.go index 18e009f75..7da6a308b 100644 --- a/pkg/spoke/apply/server_side_apply_test.go +++ b/pkg/spoke/apply/server_side_apply_test.go @@ -96,7 +96,7 @@ func TestServerSideApply(t *testing.T) { return } - var ssaConflict *ServerSideApplyConflictError + var ssaConflict = &ServerSideApplyConflictError{} if !errors.As(err, &ssaConflict) { t.Errorf("expect serverside apply conflict error, but got %v", err) } diff --git a/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go b/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go index 52c95a027..9d34d7876 100644 --- a/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go +++ b/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go @@ -173,7 +173,7 @@ func (m *ManifestWorkController) sync(ctx context.Context, controllerContext fac newManifestConditions := []workapiv1.ManifestCondition{} for _, result := range resourceResults { // ignore server side apply conflict error since it cannot be resolved by error fallback. - var ssaConflict *apply.ServerSideApplyConflictError + var ssaConflict = &apply.ServerSideApplyConflictError{} if result.Error != nil && !errors.As(result.Error, &ssaConflict) { errs = append(errs, result.Error) }