Merge pull request #123735 from thockin/master

Don't embed plural exceptions in tools Kubernetes-commit: a31a465405e52bf0ca1d29f17e2d534646074072
kubernetes · Mar 27, 2024 · 7142117 · 7142117
2 parents c9df80e + bfe3706
commit 7142117
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/cmd/client-gen/args/args.go b/cmd/client-gen/args/args.go
@@ -69,7 +69,6 @@ func New() *Args {
 		ClientsetAPIPath:          "/apis",
 		ClientsetOnly:             false,
 		FakeClient:                true,
-		PluralExceptions:          []string{"Endpoints:Endpoints"},
 		ApplyConfigurationPackage: "",
 	}
 }

diff --git a/cmd/informer-gen/args/args.go b/cmd/informer-gen/args/args.go
@@ -40,8 +40,7 @@ type Args struct {
 // New returns default arguments for the generator.
 func New() *Args {
 	return &Args{
-		SingleDirectory:  false,
-		PluralExceptions: []string{"Endpoints:Endpoints"},
+		SingleDirectory: false,
 	}
 }
 

diff --git a/cmd/lister-gen/args/args.go b/cmd/lister-gen/args/args.go
@@ -35,9 +35,7 @@ type Args struct {
 
 // New returns default arguments for the generator.
 func New() *Args {
-	return &Args{
-		PluralExceptions: []string{"Endpoints:Endpoints"},
-	}
+	return &Args{}
 }
 
 // AddFlags add the generator flags to the flag set.

diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/google/gofuzz v1.2.0
 	github.com/spf13/pflag v1.0.5
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5
+	k8s.io/apimachinery v0.0.0-20240307044802-25164f774551
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70
 	k8s.io/klog/v2 v2.120.1
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
@@ -36,5 +36,3 @@ require (
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
-
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5
diff --git a/go.sum b/go.sum
@@ -117,8 +117,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5 h1:YRP8FbAab9hlobsEfyUG7P6dC6hbVTLw0eFY/AnewmY=
-k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
+k8s.io/apimachinery v0.0.0-20240307044802-25164f774551 h1:uzmc7GC/4uB5xeS8MaTO/UgsFRt2eepWEh0EIg1Og5c=
+k8s.io/apimachinery v0.0.0-20240307044802-25164f774551/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
 k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=