Remove dep on set-gen: gone in gengo/v2
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
| 				} | ||||
| 			} | ||||
| 		}) | ||||
| 	} | ||||
|   | ||||
| @@ -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 { | ||||
|   | ||||
| @@ -1 +0,0 @@ | ||||
| set-gen | ||||
| @@ -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.") | ||||
| } | ||||
| @@ -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" | ||||
| ) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Tim Hockin
					Tim Hockin