fixes test failures

fixes more test failures mute example test missing runtime pkg
kubernetes-sigs · Mar 10, 2020 · c7d39f9 · c7d39f9
1 parent 335255d
commit c7d39f9
Show file tree

Hide file tree

Showing 12 changed files with 574 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: go
 
 go:
 - 1.13.2
+- 1.12.2
 
 go_import_path: sigs.k8s.io/apiserver-builder-alpha
 

diff --git a/cmd/apiregister-gen/generators/admission_generator.go b/cmd/apiregister-gen/generators/admission_generator.go
@@ -48,6 +48,7 @@ func (d *admissionGenerator) Imports(c *generator.Context) []string {
 		"sigs.k8s.io/apiserver-builder-alpha/pkg/cmd/server",
 		"k8s.io/client-go/rest",
 		`genericserver "k8s.io/apiserver/pkg/server"`,
+		"k8s.io/apiserver/pkg/admission",
 	}
 	for _, kind := range d.admissionKinds {
 		imports = append(imports, fmt.Sprintf(

diff --git a/cmd/apiserver-boot/boot/create/controller.go b/cmd/apiserver-boot/boot/create/controller.go
@@ -114,6 +114,7 @@ var log = logf.Log.WithName("{{ lower .Resource.Kind }}-controller")
 
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"

diff --git a/cmd/apiserver-boot/boot/create/controller_test_suite.go b/cmd/apiserver-boot/boot/create/controller_test_suite.go
@@ -43,6 +43,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/apiserver-builder-alpha/pkg/test/suite"
 	"{{ .Repo }}/pkg/apis"
 )
 

diff --git a/cmd/go.sum b/cmd/go.sum
@@ -511,6 +511,7 @@ golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59 h1:QjA/9ArTfVTLfEhClDCG7SGrZkZixxWpwNCDiwJfh88=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDWUPb+kt8f1KW8oQzFejQw=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=

diff --git a/example/basic/go.mod b/example/basic/go.mod
@@ -3,41 +3,17 @@ module sigs.k8s.io/apiserver-builder-alpha/example/basic
 go 1.13
 
 require (
-	github.com/Azure/go-autorest v13.0.0+incompatible // indirect
-	github.com/asaskevich/govalidator v0.0.0-20171111151018-521b25f4b05f // indirect
-	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-	github.com/go-logr/zapr v0.1.1 // indirect
-	github.com/go-openapi/analysis v0.0.0-20160815203709-b44dc874b601 // indirect
 	github.com/go-openapi/loads v0.0.0-20160704185440-18441dfa706d
 	github.com/go-openapi/runtime v0.0.0-20160704190703-11e322eeecc1
 	github.com/go-openapi/spec v0.19.2
 	github.com/go-openapi/validate v0.19.2
-	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
-	github.com/google/go-cmp v0.3.1 // indirect
-	github.com/gorilla/websocket v1.4.1 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190723091251-e0797f438f94 // indirect
-	github.com/hashicorp/hcl v0.0.0-20171017181929-23c074d0eceb // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/lib/pq v1.2.0 // indirect
-	github.com/magiconair/properties v1.7.4 // indirect
-	github.com/mattn/go-sqlite3 v1.11.0 // indirect
-	github.com/mitchellh/mapstructure v0.0.0-20180111000720-b4575eea38cc // indirect
-	github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
-	github.com/pelletier/go-toml v1.1.0 // indirect
-	github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c // indirect
 	github.com/rancher/kine v0.3.2
-	github.com/spf13/cast v1.1.0 // indirect
 	github.com/spf13/cobra v0.0.5
-	github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec // indirect
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v0.0.0-20160820190039-7fb2782df3d8
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
-	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
-	gomodules.xyz/jsonpatch v2.0.0+incompatible // indirect
 	k8s.io/api v0.17.0
 	k8s.io/apiextensions-apiserver v0.17.0
 	k8s.io/apimachinery v0.17.0
@@ -47,10 +23,8 @@ require (
 	k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
 	k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
 	k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a
+	sigs.k8s.io/apiserver-builder-alpha v0.0.0-20200303021738-6e294aee8ffe
 	sigs.k8s.io/controller-runtime v0.3.1-0.20191029211253-40070e2a1958
-	sigs.k8s.io/controller-tools v0.1.11-0.20190405182121-56d42b19e55a // indirect
-	sigs.k8s.io/kubebuilder v1.0.8 // indirect
-	sigs.k8s.io/structured-merge-diff v1.0.0 // indirect
 	sigs.k8s.io/testing_frameworks v0.1.1
 )
 
@@ -299,3 +273,5 @@ replace sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v
 replace sigs.k8s.io/testing_frameworks => sigs.k8s.io/testing_frameworks v0.1.1
 
 replace sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
+
+replace sigs.k8s.io/apiserver-builder-alpha => ../../../apiserver-builder-alpha
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ language: go @@
     go:
     - 1.13.2
+    - 1.12.2
     go_import_path: sigs.k8s.io/apiserver-builder-alpha
@@ Expand Down @@