github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-17 14:48:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nil pointer panic (#157)

Browse Source 
Signed-off-by: zhujian <jiazhu@redhat.com>

Signed-off-by: zhujian <jiazhu@redhat.com>
This commit is contained in:
Jian Zhu
2022-09-09 10:58:42 +08:00
committed by GitHub
parent 6a0f69fd47
commit 2a7edddede
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/spoke/apply/server_side_apply_test.go
View File

@@ -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)
}

2
pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go
View File

@@ -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)
}