vendor: goodbye vendor (#149)

Signed-off-by: Jason Liu <jasonliu747@gmail.com>

Author: jasonliu747

.dockerignore

@@ -2,3 +2,4 @@
 # Ignore build and test binaries.
 bin/
 testbin/
+vendor/

.github/workflows/ci.yaml

@@ -27,8 +27,6 @@ jobs:
       - uses: golangci/golangci-lint-action@v3
         with:
           args: --verbose
-          skip-pkg-cache: true
-          skip-build-cache: true
 
   staticcheck:
     runs-on: ubuntu-latest
@@ -77,7 +75,7 @@ jobs:
           git diff --cached --exit-code || (echo 'Please run "make manifests" to generate manifests' && exit 1);
       - name: Check auto-generated codes
         run: |
-          make generate && git add apis &&
+          make generate && git add pkg apis &&
           git diff --cached --exit-code || (echo 'Please run "make generate" to generate Go codes' && exit 1);
       - name: Verify gofmt
         run: |

.gitignore

@@ -7,6 +7,9 @@
 bin
 testbin/*
 
+# Go dependencies folder
+vendor
+
 # Test binary, build with `go test -c`
 *.test
 

Makefile

@@ -17,7 +17,7 @@ KOORD_SCHEDULER_IMG ?= "${REG}/${REG_NS}/koord-scheduler:${GIT_BRANCH}-${GIT_COM
 ENVTEST_K8S_VERSION = 1.23
 
 # Set license header files.
-LICENSE_HEADER_GO ?= hack/boilerplate.go.txt
+LICENSE_HEADER_GO ?= hack/boilerplate/boilerplate.go.txt
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -61,9 +61,8 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	@hack/generate_client.sh
-	@hack/update-scheduler-codegen.sh
 	$(CONTROLLER_GEN) object:headerFile="$(LICENSE_HEADER_GO)" paths="./apis/..."
+	@hack/update-codegen.sh
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
@@ -82,7 +81,7 @@ lint-go: golangci-lint ## Lint Go code.
 
 .PHONY: lint-license
 lint-license: 
-	$(HACK_DIR)/update-license-header.sh
+	@hack/update-license-header.sh
 
 .PHONY: test
 test: manifests generate fmt vet envtest ## Run tests.
@@ -174,8 +173,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 ##@ Build Dependencies
 
 ## Location to install dependencies to
-PWD ?= $(shell pwd)
-LOCALBIN ?= $(PWD)/bin
+LOCALBIN ?= $(shell pwd)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 

hack/boilerplate.go.txt hack/boilerplate/boilerplate.go.txthack/boilerplate.go.txt renamed to hack/boilerplate/boilerplate.go.txt

@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+#
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 # replace corrected plural/singular name of nodeslo crd.
 sed -in-place -e 's/  name: nodesloes.slo.koordinator.sh/  name: nodeslos.slo.koordinator.sh/g' config/crd/bases/slo.koordinator.sh_nodesloes.yaml

hack/fix_crd_plural.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+#
 # Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 
 set -o errexit
 set -o nounset
@@ -47,10 +48,10 @@ GROUPS_WITH_VERSIONS="$4"
 shift 4
 
 (
-  # To support running this script from anywhere, we have to first cd into this directory
-  # so we can install the tools.
+  # To support running this script from anywhere, first cd into this directory,
+  # and then install with forced module mode on and fully qualified name.
   cd "$(dirname "${0}")"
-  go install ./cmd/{defaulter-gen,client-gen,lister-gen,informer-gen,deepcopy-gen}
+  GO111MODULE=on go install k8s.io/code-generator/cmd/{defaulter-gen,client-gen,lister-gen,informer-gen,deepcopy-gen}
 )
 # Go installs the above commands to get installed in $GOBIN if defined, and $GOPATH/bin otherwise:
 GOBIN="$(go env GOBIN)"
@@ -71,7 +72,7 @@ done
 
 if [ "${GENS}" = "all" ] || grep -qw "deepcopy" <<<"${GENS}"; then
   echo "Generating deepcopy funcs"
-  "${gobin}/deepcopy-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" -O zz_generated.deepcopy --bounding-dirs "${APIS_PKG}" "$@"
+  "${gobin}/deepcopy-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" -O zz_generated.deepcopy "$@"
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "client" <<<"${GENS}"; then
@@ -92,4 +93,4 @@ if [ "${GENS}" = "all" ] || grep -qw "informer" <<<"${GENS}"; then
            --listers-package "${OUTPUT_PKG}/listers" \
            --output-package "${OUTPUT_PKG}/informers" \
            "$@"
-fi
+fi

…k8s.io/code-generator/generate-groups.sh hack/generate-groups.shvendor/k8s.io/code-generator/generate-groups.sh renamed to hack/generate-groups.sh vendor/k8s.io/code-generator/generate-groups.sh renamed to hack/generate-groups.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+#
 # Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 
 set -o errexit
 set -o nounset
@@ -47,7 +48,12 @@ EXT_APIS_PKG="$4"
 GROUPS_WITH_VERSIONS="$5"
 shift 5
 
-go install ./"$(dirname "${0}")"/cmd/{defaulter-gen,conversion-gen,client-gen,lister-gen,informer-gen,deepcopy-gen,openapi-gen}
+(
+  # To support running this script from anywhere, first cd into this directory,
+  # and then install with forced module mode on and fully qualified name.
+  cd "$(dirname "${0}")"
+  GO111MODULE=on go install k8s.io/code-generator/cmd/{defaulter-gen,conversion-gen,client-gen,lister-gen,informer-gen,deepcopy-gen,openapi-gen}
+)
 
 function codegen::join() { local IFS="$1"; shift; echo "$*"; }
 
@@ -72,7 +78,7 @@ done
 
 if [ "${GENS}" = "all" ] || grep -qw "deepcopy" <<<"${GENS}"; then
   echo "Generating deepcopy funcs"
-  "${GOPATH}/bin/deepcopy-gen" --input-dirs "$(codegen::join , "${ALL_FQ_APIS[@]}")" -O zz_generated.deepcopy --bounding-dirs "${INT_APIS_PKG},${EXT_APIS_PKG}" "$@"
+  "${GOPATH}/bin/deepcopy-gen" --input-dirs "$(codegen::join , "${ALL_FQ_APIS[@]}")" -O zz_generated.deepcopy "$@"
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "defaulter" <<<"${GENS}"; then
@@ -119,4 +125,4 @@ if [ "${GENS}" = "all" ] || grep -qw "openapi" <<<"${GENS}"; then
            --output-package "${OUTPUT_PKG}/openapi" \
            -O zz_generated.openapi \
            "$@"
-fi
+fi

…de-generator/generate-internal-groups.sh hack/generate-internal-groups.shvendor/k8s.io/code-generator/generate-internal-groups.sh renamed to hack/generate-internal-groups.sh vendor/k8s.io/code-generator/generate-internal-groups.sh renamed to hack/generate-internal-groups.sh

@@ -1,18 +1,19 @@
 #!/usr/bin/env bash
-
-#Copyright 2022 The Koordinator Authors.
-
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-
-#    http://www.apache.org/licenses/LICENSE-2.0
-
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
+#
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 set -o errexit
 set -o nounset