From 17b438483e0ff63b6592dde5614f07f85ca2c77f Mon Sep 17 00:00:00 2001 From: Scott Nichols Date: Mon, 17 Sep 2018 15:37:59 -0700 Subject: [PATCH] Merge with master. --- .../client/clientset/versioned/clientset.go | 21 ------------------- .../clientset/versioned/scheme/register.go | 6 ------ .../informers/externalversions/factory.go | 9 -------- .../informers/externalversions/generic.go | 6 ------ 4 files changed, 42 deletions(-) diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/clientset.go b/vendor/github.com/knative/pkg/client/clientset/versioned/clientset.go index b3c0b18fbae..e4ff53e6601 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/clientset.go +++ b/vendor/github.com/knative/pkg/client/clientset/versioned/clientset.go @@ -20,10 +20,7 @@ package versioned import ( authenticationv1alpha1 "github.com/knative/pkg/client/clientset/versioned/typed/authentication/v1alpha1" -<<<<<<< HEAD -======= duckv1alpha1 "github.com/knative/pkg/client/clientset/versioned/typed/duck/v1alpha1" ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions networkingv1alpha3 "github.com/knative/pkg/client/clientset/versioned/typed/istio/v1alpha3" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" @@ -35,12 +32,9 @@ type Interface interface { AuthenticationV1alpha1() authenticationv1alpha1.AuthenticationV1alpha1Interface // Deprecated: please explicitly pick a version if possible. Authentication() authenticationv1alpha1.AuthenticationV1alpha1Interface -<<<<<<< HEAD -======= DuckV1alpha1() duckv1alpha1.DuckV1alpha1Interface // Deprecated: please explicitly pick a version if possible. Duck() duckv1alpha1.DuckV1alpha1Interface ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions NetworkingV1alpha3() networkingv1alpha3.NetworkingV1alpha3Interface // Deprecated: please explicitly pick a version if possible. Networking() networkingv1alpha3.NetworkingV1alpha3Interface @@ -51,10 +45,7 @@ type Interface interface { type Clientset struct { *discovery.DiscoveryClient authenticationV1alpha1 *authenticationv1alpha1.AuthenticationV1alpha1Client -<<<<<<< HEAD -======= duckV1alpha1 *duckv1alpha1.DuckV1alpha1Client ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions networkingV1alpha3 *networkingv1alpha3.NetworkingV1alpha3Client } @@ -67,8 +58,6 @@ func (c *Clientset) AuthenticationV1alpha1() authenticationv1alpha1.Authenticati // Please explicitly pick a version. func (c *Clientset) Authentication() authenticationv1alpha1.AuthenticationV1alpha1Interface { return c.authenticationV1alpha1 -<<<<<<< HEAD -======= } // DuckV1alpha1 retrieves the DuckV1alpha1Client @@ -80,7 +69,6 @@ func (c *Clientset) DuckV1alpha1() duckv1alpha1.DuckV1alpha1Interface { // Please explicitly pick a version. func (c *Clientset) Duck() duckv1alpha1.DuckV1alpha1Interface { return c.duckV1alpha1 ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions } // NetworkingV1alpha3 retrieves the NetworkingV1alpha3Client @@ -114,13 +102,10 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { if err != nil { return nil, err } -<<<<<<< HEAD -======= cs.duckV1alpha1, err = duckv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions cs.networkingV1alpha3, err = networkingv1alpha3.NewForConfig(&configShallowCopy) if err != nil { return nil, err @@ -138,10 +123,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.authenticationV1alpha1 = authenticationv1alpha1.NewForConfigOrDie(c) -<<<<<<< HEAD -======= cs.duckV1alpha1 = duckv1alpha1.NewForConfigOrDie(c) ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions cs.networkingV1alpha3 = networkingv1alpha3.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) @@ -152,10 +134,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { func New(c rest.Interface) *Clientset { var cs Clientset cs.authenticationV1alpha1 = authenticationv1alpha1.New(c) -<<<<<<< HEAD -======= cs.duckV1alpha1 = duckv1alpha1.New(c) ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions cs.networkingV1alpha3 = networkingv1alpha3.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) diff --git a/vendor/github.com/knative/pkg/client/clientset/versioned/scheme/register.go b/vendor/github.com/knative/pkg/client/clientset/versioned/scheme/register.go index b2d9fa9c0a9..783c5f5ee8c 100644 --- a/vendor/github.com/knative/pkg/client/clientset/versioned/scheme/register.go +++ b/vendor/github.com/knative/pkg/client/clientset/versioned/scheme/register.go @@ -19,10 +19,7 @@ limitations under the License. package scheme import ( -<<<<<<< HEAD -======= duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1" ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions authenticationv1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" networkingv1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -56,9 +53,6 @@ func init() { // correctly. func AddToScheme(scheme *runtime.Scheme) { authenticationv1alpha1.AddToScheme(scheme) -<<<<<<< HEAD -======= duckv1alpha1.AddToScheme(scheme) ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions networkingv1alpha3.AddToScheme(scheme) } diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/factory.go b/vendor/github.com/knative/pkg/client/informers/externalversions/factory.go index 9eb4040f8d5..83e6c4afb2d 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/factory.go +++ b/vendor/github.com/knative/pkg/client/informers/externalversions/factory.go @@ -25,10 +25,7 @@ import ( versioned "github.com/knative/pkg/client/clientset/versioned" authentication "github.com/knative/pkg/client/informers/externalversions/authentication" -<<<<<<< HEAD -======= duck "github.com/knative/pkg/client/informers/externalversions/duck" ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions internalinterfaces "github.com/knative/pkg/client/informers/externalversions/internalinterfaces" istio "github.com/knative/pkg/client/informers/externalversions/istio" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -178,10 +175,7 @@ type SharedInformerFactory interface { WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool Authentication() authentication.Interface -<<<<<<< HEAD -======= Duck() duck.Interface ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions Networking() istio.Interface } @@ -189,13 +183,10 @@ func (f *sharedInformerFactory) Authentication() authentication.Interface { return authentication.New(f, f.namespace, f.tweakListOptions) } -<<<<<<< HEAD -======= func (f *sharedInformerFactory) Duck() duck.Interface { return duck.New(f, f.namespace, f.tweakListOptions) } ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions func (f *sharedInformerFactory) Networking() istio.Interface { return istio.New(f, f.namespace, f.tweakListOptions) } diff --git a/vendor/github.com/knative/pkg/client/informers/externalversions/generic.go b/vendor/github.com/knative/pkg/client/informers/externalversions/generic.go index ab57b7acfe4..aa134b49590 100644 --- a/vendor/github.com/knative/pkg/client/informers/externalversions/generic.go +++ b/vendor/github.com/knative/pkg/client/informers/externalversions/generic.go @@ -21,10 +21,7 @@ package externalversions import ( "fmt" -<<<<<<< HEAD -======= duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1" ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions v1alpha1 "github.com/knative/pkg/apis/istio/authentication/v1alpha1" v1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -61,8 +58,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource case v1alpha1.SchemeGroupVersion.WithResource("policies"): return &genericInformer{resource: resource.GroupResource(), informer: f.Authentication().V1alpha1().Policies().Informer()}, nil -<<<<<<< HEAD -======= // Group=duck.knative.dev, Version=v1alpha1 case duckv1alpha1.SchemeGroupVersion.WithResource("kresources"): return &genericInformer{resource: resource.GroupResource(), informer: f.Duck().V1alpha1().KResources().Informer()}, nil @@ -71,7 +66,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource case duckv1alpha1.SchemeGroupVersion.WithResource("topics"): return &genericInformer{resource: resource.GroupResource(), informer: f.Duck().V1alpha1().Topics().Informer()}, nil ->>>>>>> Upgrading knative.eventing resoureces to use knative.pkg.Conditions // Group=networking.istio.io, Version=v1alpha3 case v1alpha3.SchemeGroupVersion.WithResource("destinationrules"): return &genericInformer{resource: resource.GroupResource(), informer: f.Networking().V1alpha3().DestinationRules().Informer()}, nil