@@ -14,7 +14,7 @@ $(LOCALBIN):
1414
1515# # Tool Versions
1616CONTROLLER_TOOLS_VERSION ?= v0.9.2
17- CODEGEN_VERSION ?= v0.20.15
17+ CODEGEN_VERSION ?= v0.27.2
1818
1919# # Tool Binaries
2020CONTROLLER_GEN ?= $(LOCALBIN ) /controller-gen
@@ -83,34 +83,24 @@ generate-client: code-generator
8383 --go-header-file="hack/boilerplate/boilerplate.go.txt" \
8484 --clientset-name "versioned" \
8585 --output-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset" \
86- --output-base="."
87- # TODO: add the following line back once the tool has been upgraded
88- # --trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
86+ --output-base="." \
87+ --trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
8988 $(LISTER_GEN) \
9089 --input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" \
9190 --input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1" \
9291 --go-header-file="hack/boilerplate/boilerplate.go.txt" \
9392 --output-base="." \
94- --output-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers"
95- # TODO: add the following line back once the tool has been upgraded
96- # --trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
93+ --output-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers" \
94+ --trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
9795 $(INFORMER_GEN) \
9896 --input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" \
9997 --input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1" \
10098 --versioned-clientset-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/versioned" \
10199 --listers-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers" \
102100 --go-header-file="hack/boilerplate/boilerplate.go.txt" \
103101 --output-base="." \
104- --output-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/informers"
105- # TODO: add the following line back once the tool has been upgraded
106- # --trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
107- # TODO: remove the following lines once the tool has been upgraded and they are no longer needed.
108- # The `mv` and `rm` are necessary as the generators write to the gihub.com/... path.
109- mv -f github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/versioned pkg/client/clientset/versioned
110- mv -f github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/informers/externalversions pkg/client/informers/externalversions
111- mv -f github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers/controller/v1beta1 pkg/client/listers/controller/v1beta1
112- mv -f github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers/quotasubtree/v1 pkg/client/listers/quotasubtree/v1
113- rm -rf github.com
102+ --output-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/informers" \
103+ --trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
114104
115105.PHONY : controller-gen
116106controller-gen : $(CONTROLLER_GEN ) # # Download controller-gen locally if necessary.
0 commit comments