Merge branch 'master' into lint-error-return

karmada-io · Jan 4, 2024 · bef4c8d · bef4c8d
2 parents 93d6533 + 2deee5d
commit bef4c8d
Show file tree

Hide file tree

Showing 32 changed files with 774 additions and 567 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -70,6 +70,7 @@ linters-settings:
         arguments:
           - preserveScope
       - name: error-return
+      - name: error-strings
   staticcheck:
     checks:
       - all

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -17843,7 +17843,6 @@
       "properties": {
         "creationTimestamp": {
           "description": "CreationTimestamp is a timestamp representing the server time when this object was created. Clients should not set this value to avoid the time inconsistency issue. It is represented in RFC3339 form(like '2021-04-25T10:02:10Z') and is in UTC.\n\nPopulated by the system. Read-only.",
-          "default": {},
           "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time"
         },
         "fromCluster": {

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/adhocore/gronx v1.6.3
-	github.com/distribution/distribution/v3 v3.0.0-20210507173845-9329f6a62b67
+	github.com/distribution/reference v0.5.0
 	github.com/emirpasic/gods v1.18.1
 	github.com/evanphx/json-patch/v5 v5.6.0
 	github.com/go-co-op/gocron v1.30.1

diff --git a/go.sum b/go.sum
diff --git a/pkg/apis/work/v1alpha2/binding_types.go b/pkg/apis/work/v1alpha2/binding_types.go
@@ -256,7 +256,7 @@ type GracefulEvictionTask struct {
 	//
 	// Populated by the system. Read-only.
 	// +optional
-	CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"`
+	CreationTimestamp *metav1.Time `json:"creationTimestamp,omitempty"`
 }
 
 // BindingSnapshot is a snapshot of a ResourceBinding or ClusterResourceBinding.

diff --git a/pkg/apis/work/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/work/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/controllers/gracefuleviction/evictiontask.go b/pkg/controllers/gracefuleviction/evictiontask.go
@@ -44,7 +44,7 @@ func assessEvictionTasks(bindingSpec workv1alpha2.ResourceBindingSpec,
 	for _, task := range bindingSpec.GracefulEvictionTasks {
 		// set creation timestamp for new task
 		if task.CreationTimestamp.IsZero() {
-			task.CreationTimestamp = now
+			task.CreationTimestamp = &now
 			keptTasks = append(keptTasks, task)
 			continue
 		}