Merge pull request GoogleCloudPlatform#1323 from justinsb/no_more_gopath

chore: Rework deepcopy generators to not require gopath
gemmahou · Jul 23, 2024 · e29dd60 · e29dd60
2 parents 9975a63 + 84babcf
commit e29dd60
Show file tree

Hide file tree

Showing 1,525 changed files with 1,441 additions and 2,316 deletions.
diff --git a/Makefile b/Makefile
@@ -122,8 +122,9 @@ generate:
 	# Don't run go generate on `pkg/clients/generated` in the normal development flow due to high latency.
 	# This path will be covered by `generate-go-client` target specifically.
 	go mod vendor -o temp-vendor # So we can load DCL resources
-	go generate $$(go list ./pkg/... ./cmd/... ./scripts/resource-autogen/... | grep -v ./pkg/clients/generated)
+	go generate ./pkg/dcl/schema/...
 	rm -rf temp-vendor
+	go generate ./pkg/apis/...
 	make fmt
 
 # Build the docker images

diff --git a/go.mod b/go.mod
@@ -64,8 +64,6 @@ require (
 	k8s.io/apiextensions-apiserver v0.27.9
 	k8s.io/apimachinery v0.27.11
 	k8s.io/client-go v0.27.11
-	k8s.io/code-generator v0.27.9
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
 	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/controller-runtime v0.15.2
 	sigs.k8s.io/controller-tools v0.6.2

diff --git a/go.sum b/go.sum
diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Generate deepcopy for apis
-//go:generate go run ../../scripts/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/deepcopy-gen@v0.29.0 -O zz_generated.deepcopy -h ../../hack/boilerplate.go.txt -i  github.com/GoogleCloudPlatform/k8s-config-connector/pkg/apis/... --trim-path-prefix github.com/GoogleCloudPlatform/k8s-config-connector/pkg/apis
 
 // Package apis contains Kubernetes API groups.
 package apis