Merge pull request #479 from lianghao208/crd_annotation

Revisit hack/verify-crdgen.sh
kubernetes-sigs · Jan 19, 2023 · dc7b202 · dc7b202
2 parents 822c4fe + f5e63d2
commit dc7b202
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/apis/scheduling/v1alpha1/types.go b/apis/scheduling/v1alpha1/types.go
@@ -27,6 +27,7 @@ import (
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName={eq,eqs}
 // +kubebuilder:subresource:status
+// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes-sigs/scheduler-plugins/pull/52"
 type ElasticQuota struct {
 	metav1.TypeMeta `json:",inline"`
 
@@ -118,6 +119,7 @@ const (
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName={pg,pgs}
 // +kubebuilder:subresource:status
+// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes-sigs/scheduler-plugins/pull/50"
 type PodGroup struct {
 	metav1.TypeMeta `json:",inline"`
 	// Standard object's metadata.

diff --git a/hack/verify-crdgen.sh b/hack/verify-crdgen.sh
@@ -27,7 +27,7 @@ CRD_OPTIONS="crd"
 
 # Download controller-gen locally
 CONTROLLER_GEN="${GOPATH}/bin/controller-gen"
-go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2
+go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.1
 
 # 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
@@ -4,7 +4,7 @@ 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.9.2
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   name: appgroups.appgroup.diktyo.k8s.io
 spec:

diff --git a/manifests/capacityscheduling/crd.yaml b/manifests/capacityscheduling/crd.yaml
@@ -3,8 +3,8 @@ 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.9.2
+    api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/52
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   name: elasticquotas.scheduling.sigs.k8s.io
 spec:

diff --git a/manifests/coscheduling/crd.yaml b/manifests/coscheduling/crd.yaml
@@ -3,8 +3,8 @@ 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.9.2
+    api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/50
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   name: podgroups.scheduling.sigs.k8s.io
 spec:

diff --git a/manifests/networktopology/crd.yaml b/manifests/networktopology/crd.yaml
@@ -4,7 +4,7 @@ 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.9.2
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   name: networktopologies.networktopology.diktyo.k8s.io
 spec:

diff --git a/manifests/noderesourcetopology/crd.yaml b/manifests/noderesourcetopology/crd.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes/enhancements/pull/1870 # edited manually
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   name: noderesourcetopologies.topology.node.k8s.io
 spec: