Merge pull request #459 from Huang-Wei/feat/bump-controller-gen

bump controller-gen to v0.9.2
kubernetes-sigs · Dec 16, 2022 · a64627b · a64627b
2 parents 4f56158 + b29862d
commit a64627b
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 50 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -37,3 +37,14 @@ Fixes #
 
 #### Special notes for your reviewer:
 
+#### Does this PR introduce a user-facing change?
+<!--
+If no, just write "NONE" in the release-note block below.
+If yes, a release note is required:
+Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
+
+For more information on release notes see: https://git.k8s.io/community/contributors/guide/release-notes.md
+-->
+```release-note
+
+```
diff --git a/apis/scheduling/v1alpha1/types.go b/apis/scheduling/v1alpha1/types.go
@@ -22,11 +22,11 @@ import (
 	"sigs.k8s.io/scheduler-plugins/apis/scheduling"
 )
 
+// ElasticQuota sets elastic quota restrictions per namespace
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName={eq,eqs}
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// ElasticQuota sets elastic quota restrictions per namespace
+// +kubebuilder:subresource:status
 type ElasticQuota struct {
 	metav1.TypeMeta `json:",inline"`
 
@@ -113,11 +113,11 @@ const (
 	PodGroupLabel = "pod-group." + scheduling.GroupName
 )
 
+// PodGroup is a collection of Pod; used for batch workload.
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName={pg,pgs}
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// PodGroup is a collection of Pod; used for batch workload.
+// +kubebuilder:subresource:status
 type PodGroup struct {
 	metav1.TypeMeta `json:",inline"`
 	// Standard object's metadata.

diff --git a/hack/verify-crdgen.sh b/hack/verify-crdgen.sh
@@ -23,11 +23,11 @@ source "${SCRIPT_ROOT}/hack/lib/init.sh"
 
 kube::golang::verify_go_version
 
-CRD_OPTIONS="crd:trivialVersions=true,preserveUnknownFields=false"
+CRD_OPTIONS="crd"
 
 # Download controller-gen locally
 CONTROLLER_GEN="${GOPATH}/bin/controller-gen"
-go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
+go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2
 
 # Generate CRD
 api_paths="./apis/scheduling/v1alpha1/...;./vendor/github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/...;./vendor/github.com/diktyo-io/appgroup-api/pkg/apis/...;./vendor/github.com/diktyo-io/networktopology-api/pkg/apis/..."

diff --git a/manifests/appgroup/crd.yaml b/manifests/appgroup/crd.yaml
@@ -1,11 +1,10 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/432 # edited manually
-    controller-gen.kubebuilder.io/version: v0.6.2
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: appgroups.appgroup.diktyo.k8s.io
 spec:
@@ -196,9 +195,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/manifests/capacityscheduling/crd.yaml b/manifests/capacityscheduling/crd.yaml
@@ -1,11 +1,10 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/52 # edited manually
-    controller-gen.kubebuilder.io/version: v0.6.2
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: elasticquotas.scheduling.sigs.k8s.io
 spec:
@@ -79,9 +78,5 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+    subresources:
+      status: {}
diff --git a/manifests/coscheduling/crd.yaml b/manifests/coscheduling/crd.yaml
@@ -1,11 +1,10 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/50 # edited manually
-    controller-gen.kubebuilder.io/version: v0.6.2
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: podgroups.scheduling.sigs.k8s.io
 spec:
@@ -98,9 +97,5 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+    subresources:
+      status: {}
diff --git a/manifests/networktopology/crd.yaml b/manifests/networktopology/crd.yaml
@@ -1,11 +1,10 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/432 # edited manually
-    controller-gen.kubebuilder.io/version: v0.6.2
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: networktopologies.networktopology.diktyo.k8s.io
 spec:
@@ -147,9 +146,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/manifests/noderesourcetopology/crd.yaml b/manifests/noderesourcetopology/crd.yaml
@@ -1,11 +1,10 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes/enhancements/pull/1870 # edited manually
-    controller-gen.kubebuilder.io/version: v0.6.2
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: noderesourcetopologies.topology.node.k8s.io
 spec:
@@ -137,9 +136,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/pkg/controller/elasticquota.go b/pkg/controller/elasticquota.go
@@ -202,7 +202,7 @@ func (ctrl *ElasticQuotaController) syncHandler(key string) error {
 	}
 	if _, err = ctrl.schedClient.SchedulingV1alpha1().ElasticQuotas(namespace).
 		Patch(context.TODO(), eq.Name, types.MergePatchType,
-			patch, metav1.PatchOptions{}); err != nil {
+			patch, metav1.PatchOptions{}, "status"); err != nil {
 		return err
 	}
 	ctrl.recorder.Event(eq, v1.EventTypeNormal, "Synced", fmt.Sprintf("Elastic Quota %s synced successfully", key))

diff --git a/pkg/controller/podgroup.go b/pkg/controller/podgroup.go
@@ -280,7 +280,7 @@ func (ctrl *PodGroupController) patchPodGroup(old, new *schedv1alpha1.PodGroup)
 		}
 
 		_, err = ctrl.pgClient.SchedulingV1alpha1().PodGroups(old.Namespace).Patch(context.TODO(), old.Name, types.MergePatchType,
-			patch, metav1.PatchOptions{})
+			patch, metav1.PatchOptions{}, "status")
 		if err != nil {
 			return err
 		}