Merge pull request #4838 from ywk253100/220418_marker

Use controller-gen to generate the deep copy methods for objects

changelogs/unreleased/4838-ywk253100

@@ -0,0 +1 @@
+Use controller-gen to generate the deep copy methods for objects

config/rbac/role.yaml

@@ -55,7 +55,7 @@ rules:
 - apiGroups:
   - velero.io
   resources:
-  - schedules
+  - podvolumebackups
   verbs:
   - create
   - delete
@@ -67,15 +67,15 @@ rules:
 - apiGroups:
   - velero.io
   resources:
-  - schedules/status
+  - podvolumebackups/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - velero.io
   resources:
-  - serverstatusrequests
+  - schedules
   verbs:
   - create
   - delete
@@ -87,15 +87,15 @@ rules:
 - apiGroups:
   - velero.io
   resources:
-  - serverstatusrequests/status
+  - schedules/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - velero.io
   resources:
-  - podvolumebackup
+  - serverstatusrequests
   verbs:
   - create
   - delete
@@ -107,8 +107,8 @@ rules:
 - apiGroups:
   - velero.io
   resources:
-  - podvolumebackup/status
+  - serverstatusrequests/status
   verbs:
   - get
   - patch
-  - update
+  - update

hack/update-generated-crd-code.sh

@@ -51,7 +51,9 @@ controller-gen \
   paths=./pkg/apis/velero/v1/... \
   rbac:roleName=velero-perms \
   paths=./pkg/controller/... \
-  output:crd:artifacts:config=config/crd/v1/bases
+  output:crd:artifacts:config=config/crd/v1/bases \
+  object \
+  paths=./pkg/apis/velero/v1/...
 
 # this is a super hacky workaround for https://github.com/kubernetes/kubernetes/issues/91395
 # which a result of fixing the validation on CRD objects. The validation ensures the fields that are list map keys, are either marked

hack/verify-generated-crd-code.sh

@@ -16,7 +16,7 @@
 
 HACK_DIR=$(dirname "${BASH_SOURCE}")
 
-${HACK_DIR}/update-generated-crd-code.sh --verify-only
+${HACK_DIR}/update-generated-crd-code.sh
 
 # ensure no changes to generated CRDs
 if ! git diff --exit-code config/crd/v1/crds/crds.go >/dev/null; then

pkg/apis/velero/v1/schedule_types.go

@@ -80,8 +80,8 @@ type ScheduleStatus struct {
 // TODO(2.0) After converting all resources to use the runtime-controller client, the genclient and k8s:deepcopy markers will no longer be needed and should be removed.
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root
 // +kubebuilder:object:generate=true
+// +kubebuilder:object:root=true
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Name",type="string",JSONPath=".metadata.name",description="Name of the schedule"
@@ -106,7 +106,8 @@ type Schedule struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root
+// +kubebuilder:object:generate=true
+// +kubebuilder:object:root=true
 
 // ScheduleList is a list of Schedules.
 type ScheduleList struct {