kcp-dev · ntnn · Apr 28, 2025 · May 2, 2025 · May 2, 2025
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ TMPDIR := $(shell mktemp -d)
 
 CODE_GENERATOR_VER := v2.4.0
 CODE_GENERATOR_BIN := code-generator
-CODE_GENERATOR := $(TOOLS_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER)
+CODE_GENERATOR := go run github.com/ntnn/kcp-code-generator/v2@v2.3.1-0.20250502174131-b2154dca874d
 export CODE_GENERATOR # so hack scripts can use it
 
 $(CODE_GENERATOR):

diff --git a/apiextensions/listers/apiextensions/v1/customresourcedefinition_expansion.go b/apiextensions/listers/apiextensions/v1/customresourcedefinition_expansion.go
diff --git a/apiextensions/listers/apiextensions/v1beta1/customresourcedefinition_expansion.go b/apiextensions/listers/apiextensions/v1beta1/customresourcedefinition_expansion.go
diff --git a/go.mod b/go.mod
@@ -14,6 +14,10 @@ require (
 	k8s.io/klog/v2 v2.130.1
 )
 
+replace github.com/kcp-dev/apimachinery/v2 => github.com/ntnn/kcp-apimachinery/v2 v2.0.1-0.20250428144613-bc81e2899ce5
+
+replace github.com/kcp-dev/code-generator/v2 => github.com/ntnn/kcp-code-generator/v2 v2.3.1-0.20250502174131-b2154dca874d
+
 require (
 	cel.dev/expr v0.19.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect

diff --git a/go.sum b/go.sum
@@ -72,8 +72,6 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 h1:6MeV6CBJhNxF3DhkdwhcqeyEc8Al2MGeKFNA0O95icc=
-github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA=
 github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU=
 github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -95,6 +93,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/ntnn/kcp-apimachinery/v2 v2.0.1-0.20250428144613-bc81e2899ce5 h1:mX0T75UptYapqS2S9FGpFv9Ot3d3Igu5WQdvqXNwJxg=
+github.com/ntnn/kcp-apimachinery/v2 v2.0.1-0.20250428144613-bc81e2899ce5/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA=
 github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
 github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=

diff --git a/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go
diff --git a/listers/admissionregistration/v1/validatingadmissionpolicy_expansion.go b/listers/admissionregistration/v1/validatingadmissionpolicy_expansion.go
diff --git a/listers/admissionregistration/v1/validatingadmissionpolicybinding_expansion.go b/listers/admissionregistration/v1/validatingadmissionpolicybinding_expansion.go
diff --git a/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go
diff --git a/listers/admissionregistration/v1alpha1/validatingadmissionpolicy_expansion.go b/listers/admissionregistration/v1alpha1/validatingadmissionpolicy_expansion.go
diff --git a/listers/admissionregistration/v1alpha1/validatingadmissionpolicybinding_expansion.go b/listers/admissionregistration/v1alpha1/validatingadmissionpolicybinding_expansion.go
diff --git a/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go
diff --git a/listers/admissionregistration/v1beta1/validatingadmissionpolicy_expansion.go b/listers/admissionregistration/v1beta1/validatingadmissionpolicy_expansion.go
diff --git a/listers/admissionregistration/v1beta1/validatingadmissionpolicybinding_expansion.go b/listers/admissionregistration/v1beta1/validatingadmissionpolicybinding_expansion.go
diff --git a/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go
diff --git a/listers/apiserverinternal/v1alpha1/storageversion_expansion.go b/listers/apiserverinternal/v1alpha1/storageversion_expansion.go
diff --git a/listers/apps/v1/controllerrevision_expansion.go b/listers/apps/v1/controllerrevision_expansion.go
diff --git a/listers/apps/v1/deployment_expansion.go b/listers/apps/v1/deployment_expansion.go
diff --git a/listers/apps/v1beta1/controllerrevision_expansion.go b/listers/apps/v1beta1/controllerrevision_expansion.go
diff --git a/listers/apps/v1beta1/deployment_expansion.go b/listers/apps/v1beta1/deployment_expansion.go
diff --git a/listers/apps/v1beta2/controllerrevision_expansion.go b/listers/apps/v1beta2/controllerrevision_expansion.go
diff --git a/listers/apps/v1beta2/deployment_expansion.go b/listers/apps/v1beta2/deployment_expansion.go
diff --git a/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go
diff --git a/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go
diff --git a/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go
diff --git a/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go
diff --git a/listers/batch/v1/cronjob_expansion.go b/listers/batch/v1/cronjob_expansion.go
diff --git a/listers/batch/v1beta1/cronjob_expansion.go b/listers/batch/v1beta1/cronjob_expansion.go
diff --git a/listers/certificates/v1/certificatesigningrequest_expansion.go b/listers/certificates/v1/certificatesigningrequest_expansion.go
diff --git a/listers/certificates/v1alpha1/clustertrustbundle_expansion.go b/listers/certificates/v1alpha1/clustertrustbundle_expansion.go
diff --git a/listers/certificates/v1beta1/certificatesigningrequest_expansion.go b/listers/certificates/v1beta1/certificatesigningrequest_expansion.go
diff --git a/listers/coordination/v1/lease_expansion.go b/listers/coordination/v1/lease_expansion.go
diff --git a/listers/coordination/v1beta1/lease_expansion.go b/listers/coordination/v1beta1/lease_expansion.go
diff --git a/listers/core/v1/componentstatus_expansion.go b/listers/core/v1/componentstatus_expansion.go
diff --git a/listers/core/v1/configmap_expansion.go b/listers/core/v1/configmap_expansion.go
diff --git a/listers/core/v1/endpoints_expansion.go b/listers/core/v1/endpoints_expansion.go
diff --git a/listers/core/v1/event_expansion.go b/listers/core/v1/event_expansion.go
diff --git a/listers/core/v1/limitrange_expansion.go b/listers/core/v1/limitrange_expansion.go
diff --git a/listers/core/v1/namespace_expansion.go b/listers/core/v1/namespace_expansion.go
diff --git a/listers/core/v1/node_expansion.go b/listers/core/v1/node_expansion.go
diff --git a/listers/core/v1/persistentvolume_expansion.go b/listers/core/v1/persistentvolume_expansion.go
diff --git a/listers/core/v1/persistentvolumeclaim_expansion.go b/listers/core/v1/persistentvolumeclaim_expansion.go
diff --git a/listers/core/v1/pod_expansion.go b/listers/core/v1/pod_expansion.go
diff --git a/listers/core/v1/podtemplate_expansion.go b/listers/core/v1/podtemplate_expansion.go
diff --git a/listers/core/v1/resourcequota_expansion.go b/listers/core/v1/resourcequota_expansion.go
diff --git a/listers/core/v1/secret_expansion.go b/listers/core/v1/secret_expansion.go
diff --git a/listers/core/v1/service_expansion.go b/listers/core/v1/service_expansion.go
diff --git a/listers/core/v1/serviceaccount_expansion.go b/listers/core/v1/serviceaccount_expansion.go
diff --git a/listers/discovery/v1/endpointslice_expansion.go b/listers/discovery/v1/endpointslice_expansion.go
diff --git a/listers/discovery/v1beta1/endpointslice_expansion.go b/listers/discovery/v1beta1/endpointslice_expansion.go
diff --git a/listers/events/v1/event_expansion.go b/listers/events/v1/event_expansion.go
diff --git a/listers/events/v1beta1/event_expansion.go b/listers/events/v1beta1/event_expansion.go
diff --git a/listers/extensions/v1beta1/deployment_expansion.go b/listers/extensions/v1beta1/deployment_expansion.go
diff --git a/listers/extensions/v1beta1/ingress_expansion.go b/listers/extensions/v1beta1/ingress_expansion.go