diff --git a/build/tools.go b/build/tools.go index e9ac7cab55f..d3d25b00095 100644 --- a/build/tools.go +++ b/build/tools.go @@ -28,7 +28,6 @@ import ( _ "k8s.io/gengo/examples/deepcopy-gen/generators" _ "k8s.io/gengo/examples/defaulter-gen/generators" _ "k8s.io/gengo/examples/import-boss/generators" - _ "k8s.io/gengo/examples/set-gen/generators" _ "k8s.io/kube-openapi/cmd/openapi-gen" // submodule test dependencies diff --git a/pkg/controlplane/controller/systemnamespaces/system_namespaces_controller_test.go b/pkg/controlplane/controller/systemnamespaces/system_namespaces_controller_test.go index 8120930a81e..4bc3f051e42 100644 --- a/pkg/controlplane/controller/systemnamespaces/system_namespaces_controller_test.go +++ b/pkg/controlplane/controller/systemnamespaces/system_namespaces_controller_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" - "k8s.io/gengo/examples/set-gen/sets" ) // Test_Controller validates the garbage collection logic for the apiserverleasegc controller. @@ -124,13 +123,16 @@ func Test_Controller(t *testing.T) { t.Errorf("unexpected error: %v", err) } - got := sets.NewString() + got := map[string]bool{} for _, ns := range namespaces { - got.Insert(ns.Name) + got[ns.Name] = true } - if !got.HasAll(systemNamespaces...) { - t.Errorf("unexpected namespaces: %v", got.List()) + for _, ns := range systemNamespaces { + if !got[ns] { + t.Errorf("unexpected namespaces: %v", namespaces) + break + } } }) } diff --git a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go index 00c152581e5..ec3122db649 100644 --- a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go +++ b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go @@ -24,7 +24,6 @@ import ( "strings" "k8s.io/gengo/args" - "k8s.io/gengo/examples/set-gen/sets" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" @@ -187,11 +186,10 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat klog.Fatalf("Failed loading boilerplate: %v", err) } - inputs := sets.NewString(context.Inputs...) packages := generator.Packages{} header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...) - for i := range inputs { + for _, i := range context.Inputs { klog.V(5).Infof("Considering pkg %q", i) pkg := context.Universe[i] if pkg == nil { diff --git a/staging/src/k8s.io/code-generator/cmd/set-gen/.gitignore b/staging/src/k8s.io/code-generator/cmd/set-gen/.gitignore deleted file mode 100644 index ffe6458c963..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/set-gen/.gitignore +++ /dev/null @@ -1 +0,0 @@ -set-gen diff --git a/staging/src/k8s.io/code-generator/cmd/set-gen/main.go b/staging/src/k8s.io/code-generator/cmd/set-gen/main.go deleted file mode 100644 index 0968ce762b9..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/set-gen/main.go +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright 2015 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-gen is an example usage of gengo. -// -// Structs in the input directories with the below line in their comments will -// have sets generated for them. -// // +genset -// -// Any builtin type referenced anywhere in the input directories will have a -// set generated for it. -package main - -import ( - "os" - - "k8s.io/gengo/args" - "k8s.io/gengo/examples/set-gen/generators" - - "k8s.io/klog/v2" -) - -func main() { - klog.InitFlags(nil) - arguments := args.Default() - - // Override defaults. - arguments.InputDirs = []string{"k8s.io/kubernetes/pkg/util/sets/types"} - arguments.OutputPackagePath = "k8s.io/apimachinery/pkg/util/sets" - - if err := arguments.Execute( - generators.NameSystems(), - generators.DefaultNameSystem(), - generators.Packages, - ); err != nil { - klog.Errorf("Error: %v", err) - os.Exit(1) - } - klog.V(2).Info("Completed successfully.") -} diff --git a/staging/src/k8s.io/code-generator/tools.go b/staging/src/k8s.io/code-generator/tools.go index 90b942b0703..476bd3a9760 100644 --- a/staging/src/k8s.io/code-generator/tools.go +++ b/staging/src/k8s.io/code-generator/tools.go @@ -33,5 +33,4 @@ import ( _ "k8s.io/code-generator/cmd/lister-gen" _ "k8s.io/code-generator/cmd/openapi-gen" _ "k8s.io/code-generator/cmd/register-gen" - _ "k8s.io/code-generator/cmd/set-gen" )