diff --git a/go.mod b/go.mod index 6a413d28..9b5e3774 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,11 @@ module sigs.k8s.io/kubetest2 go 1.14 -replace k8s.io/client-go => k8s.io/client-go v0.17.3 - require ( - github.com/aws/aws-k8s-tester v1.0.0 github.com/octago/sflags v0.2.0 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.0.0 github.com/spf13/pflag v1.0.5 - k8s.io/client-go v11.0.0+incompatible //indirect k8s.io/klog v1.0.0 sigs.k8s.io/boskos v0.0.0-20200710214748-f5935686c7fc ) diff --git a/go.sum b/go.sum index b1614f37..5665a61b 100644 --- a/go.sum +++ b/go.sum @@ -1212,8 +1212,11 @@ k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo= k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI= k8s.io/cli-runtime v0.17.3 h1:0ZlDdJgJBKsu77trRUynNiWsRuAvAVPBNaQfnt/1qtc= k8s.io/cli-runtime v0.17.3/go.mod h1:X7idckYphH4SZflgNpOOViSxetiMj6xI0viMAjM81TA= +k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k= +k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI= k8s.io/client-go v0.17.3 h1:deUna1Ksx05XeESH6XGCyONNFfiQmDdqeqUvicvP6nU= k8s.io/client-go v0.17.3/go.mod h1:cLXlTMtWHkuK4tD360KpWz2gG2KtdWEr/OT02i3emRQ= +k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= k8s.io/cloud-provider v0.17.0/go.mod h1:Ze4c3w2C0bRsjkBUoHpFi+qWe3ob1wI2/7cUn+YQIDE= k8s.io/code-generator v0.17.1/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= diff --git a/kubetest2-eks/main.go b/kubetest2-eks/main.go deleted file mode 100644 index b2df4ab5..00000000 --- a/kubetest2-eks/main.go +++ /dev/null @@ -1,52 +0,0 @@ -/* -Copyright 2020 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. -*/ - -package main - -import ( - "github.com/aws/aws-k8s-tester/eks" - "github.com/aws/aws-k8s-tester/eksconfig" - "github.com/spf13/pflag" - - "sigs.k8s.io/kubetest2/pkg/app" - "sigs.k8s.io/kubetest2/pkg/types" -) - -func main() { - app.Main("eks", newEKS) -} - -// "opts" is not used in eks deployer, handled via "kubetest2/pkg/app" -// eks uses env vars, so just return empty flag set -func newEKS(opts types.Options) (types.Deployer, *pflag.FlagSet) { - cfg := eksconfig.NewDefault() // use auto-generated config - - err := cfg.UpdateFromEnvs() - if err != nil { - panic(err) - } - - if err = cfg.ValidateAndSetDefaults(); err != nil { - panic(err) - } - - dp, err := eks.New(cfg) - if err != nil { - panic(err) - } - - return dp, pflag.NewFlagSet("eks", pflag.ContinueOnError) -}