From 40a8c6d69329b9ec630cd2e279b8f7380e1f55d3 Mon Sep 17 00:00:00 2001 From: Janki Chhatbar Date: Mon, 3 Jan 2022 14:52:44 +0530 Subject: [PATCH] Rename clients from submariner and operator repo Client from operator repo is renamed to `operatorclient` and the one from Submariner repo is `submarinerclient` Signed-Off-By: Janki Chhatbar --- pkg/client/default_producer.go | 8 +++++++- pkg/client/producer.go | 5 ++++- pkg/client/restconfig_producer.go | 8 +++++++- pkg/deploy/broker.go | 2 +- pkg/subctl/cmd/deploybroker.go | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pkg/client/default_producer.go b/pkg/client/default_producer.go index 941bfb88f..e3d4590b0 100644 --- a/pkg/client/default_producer.go +++ b/pkg/client/default_producer.go @@ -19,7 +19,8 @@ limitations under the License. package client import ( - submarinerclient "github.com/submariner-io/submariner-operator/pkg/client/clientset/versioned" + operatorclient "github.com/submariner-io/submariner-operator/pkg/client/clientset/versioned" + submarinerclient "github.com/submariner-io/submariner/pkg/client/clientset/versioned" apiextclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" @@ -29,6 +30,7 @@ type DefaultProducer struct { CRDClient apiextclient.Interface KubeClient kubernetes.Interface DynamicClient dynamic.Interface + OperatorClient operatorclient.Interface SubmarinerClient submarinerclient.Interface } @@ -47,3 +49,7 @@ func (p *DefaultProducer) ForDynamic() dynamic.Interface { func (p *DefaultProducer) ForSubmariner() submarinerclient.Interface { return p.SubmarinerClient } + +func (p *DefaultProducer) ForOperator() operatorclient.Interface { + return p.OperatorClient +} diff --git a/pkg/client/producer.go b/pkg/client/producer.go index f31adb2dc..d683fd5c7 100644 --- a/pkg/client/producer.go +++ b/pkg/client/producer.go @@ -19,7 +19,8 @@ limitations under the License. package client import ( - submarinerClientset "github.com/submariner-io/submariner-operator/pkg/client/clientset/versioned" + operatorClientset "github.com/submariner-io/submariner-operator/pkg/client/clientset/versioned" + submarinerClientset "github.com/submariner-io/submariner/pkg/client/clientset/versioned" apiextClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" @@ -32,5 +33,7 @@ type Producer interface { ForDynamic() dynamic.Interface + ForOperator() operatorClientset.Interface + ForSubmariner() submarinerClientset.Interface } diff --git a/pkg/client/restconfig_producer.go b/pkg/client/restconfig_producer.go index 59016b54e..9fcd265a5 100644 --- a/pkg/client/restconfig_producer.go +++ b/pkg/client/restconfig_producer.go @@ -20,7 +20,8 @@ package client import ( "github.com/pkg/errors" - submarinerClientset "github.com/submariner-io/submariner-operator/pkg/client/clientset/versioned" + operatorClientset "github.com/submariner-io/submariner-operator/pkg/client/clientset/versioned" + submarinerClientset "github.com/submariner-io/submariner/pkg/client/clientset/versioned" apiextClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" @@ -41,6 +42,11 @@ func NewProducerFromRestConfig(config *rest.Config) (Producer, error) { return nil, errors.Wrap(err, "error creating dynamic client") } + p.OperatorClient, err = operatorClientset.NewForConfig(config) + if err != nil { + return nil, errors.Wrap(err, "error creating operator client") + } + p.SubmarinerClient, err = submarinerClientset.NewForConfig(config) if err != nil { return nil, errors.Wrap(err, "error creating submariner client") diff --git a/pkg/deploy/broker.go b/pkg/deploy/broker.go index aebe36f0a..c61cdd480 100644 --- a/pkg/deploy/broker.go +++ b/pkg/deploy/broker.go @@ -108,7 +108,7 @@ func deploy(options *BrokerOptions, status reporter.Interface, clientProducer cl status.Start("Deploying the broker") - err = brokercr.Ensure(clientProducer.ForSubmariner(), options.BrokerNamespace, options.BrokerSpec) + err = brokercr.Ensure(clientProducer.ForOperator(), options.BrokerNamespace, options.BrokerSpec) if err != nil { return status.Error(err, "Broker deployment failed") } diff --git a/pkg/subctl/cmd/deploybroker.go b/pkg/subctl/cmd/deploybroker.go index 536d83e43..7cb548617 100644 --- a/pkg/subctl/cmd/deploybroker.go +++ b/pkg/subctl/cmd/deploybroker.go @@ -129,7 +129,7 @@ var deployBroker = &cobra.Command{ utils.ExitOnError("Error deploying the operator", err) status.Start("Deploying the broker") - err = brokercr.Ensure(clientProducer.ForSubmariner(), brokerNamespace, populateBrokerSpec()) + err = brokercr.Ensure(clientProducer.ForOperator(), brokerNamespace, populateBrokerSpec()) if err == nil { status.QueueSuccessMessage("The broker has been deployed") status.EndWith(cli.Success)