Merge pull request #481 from zwpaper/master

update 'update-codegen.sh' to make it works outside GOPATH

Author: k8s-ci-robot

config/crd/bases/scheduling.sigs.k8s.io_elasticquotas.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
+    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:
@@ -79,9 +78,5 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+    subresources:
+      status: {}

config/crd/bases/scheduling.sigs.k8s.io_podgroups.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
+    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:
@@ -98,9 +97,5 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+    subresources:
+      status: {}

hack/update-codegen.sh

@@ -23,7 +23,7 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[@]}")/..
 TOOLS_DIR=$(realpath ./hack/tools)
 TOOLS_BIN_DIR="${TOOLS_DIR}/bin"
 GO_INSTALL=$(realpath ./hack/go-install.sh)
-CONTROLLER_GEN_VER=v0.6.2
+CONTROLLER_GEN_VER=v0.11.1
 CONTROLLER_GEN_BIN=controller-gen
 CONTROLLER_GEN=${TOOLS_BIN_DIR}/${CONTROLLER_GEN_BIN}-${CONTROLLER_GEN_VER}
 # Need v1 to support defaults in CRDs, unfortunately limiting us to k8s 1.16+
@@ -39,11 +39,13 @@ bash "${CODEGEN_PKG}"/generate-internal-groups.sh \
   sigs.k8s.io/scheduler-plugins/apis \
   sigs.k8s.io/scheduler-plugins/apis \
   "config:v1,v1beta2,v1beta3" \
+  --trim-path-prefix sigs.k8s.io/scheduler-plugins \
+  --output-base "./" \
   --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.generatego.txt
 
-
 ${CONTROLLER_GEN} object:headerFile="hack/boilerplate/boilerplate.generatego.txt" \
-paths="./apis/scheduling/..."
+  paths="./apis/scheduling/..."
 
 ${CONTROLLER_GEN} ${CRD_OPTIONS} rbac:roleName=work-manager webhook \
-paths="./apis/scheduling/..." output:crd:artifacts:config=config/crd/bases
+  paths="./apis/scheduling/..." \
+  output:crd:artifacts:config=config/crd/bases