From 1b7c79b128f26ea64d933217863dccd35f7a25f7 Mon Sep 17 00:00:00 2001 From: Fabian Ruff Date: Fri, 1 Dec 2017 15:08:23 +0100 Subject: [PATCH] Remove unused code --- pkg/client/openstack/client.go | 31 ------------------------------ pkg/cmd/kubernikusctl/auth/init.go | 1 - pkg/controller/ground.go | 15 --------------- pkg/controller/operator.go | 2 -- 4 files changed, 49 deletions(-) diff --git a/pkg/client/openstack/client.go b/pkg/client/openstack/client.go index 520c7194c3..6e038e4a0f 100644 --- a/pkg/client/openstack/client.go +++ b/pkg/client/openstack/client.go @@ -217,37 +217,6 @@ func (c *client) adminClient() (*gophercloud.ProviderClient, error) { return c.adminProviderClient, nil } -func (c *client) controlPlaneClient() (*gophercloud.ProviderClient, error) { - if c.adminProviderClient != nil { - return c.adminProviderClient, nil - } - - provider, err := openstack.NewClient(c.authURL) - if err != nil { - return nil, err - } - - authOptions := &tokens.AuthOptions{ - IdentityEndpoint: c.authURL, - Username: c.authUsername, - Password: c.authPassword, - DomainName: c.authDomain, - AllowReauth: true, - Scope: tokens.Scope{ - ProjectID: "06a832fedd4b422bbf2d6d52be59a93d", // TODO: wtf - }, - } - - err = openstack.AuthenticateV3(provider, authOptions, gophercloud.EndpointOpts{}) - if err != nil { - return nil, err - } - - c.adminProviderClient = provider - - return c.adminProviderClient, nil -} - func (c *client) klusterClientFor(kluster *kubernikus_v1.Kluster) (*gophercloud.ProviderClient, error) { secret_name := kluster.Name diff --git a/pkg/cmd/kubernikusctl/auth/init.go b/pkg/cmd/kubernikusctl/auth/init.go index dc8904e91e..645f2f28fb 100644 --- a/pkg/cmd/kubernikusctl/auth/init.go +++ b/pkg/cmd/kubernikusctl/auth/init.go @@ -22,7 +22,6 @@ type InitOptions struct { url *url.URL name string kubeconfigPath string - context string openstack *common.OpenstackClient kubernikus *common.KubernikusClient diff --git a/pkg/controller/ground.go b/pkg/controller/ground.go index e92f48277b..baea6acf55 100644 --- a/pkg/controller/ground.go +++ b/pkg/controller/ground.go @@ -481,21 +481,6 @@ func (op *GroundControl) discoverOpenstackInfo(kluster *v1.Kluster) error { return err } -func (op *GroundControl) seedClusterRoles(kluster *v1.Kluster) error { - glog.V(5).Infof("[%v] Seeding ClusterRoles and ClusterRoleBindings", kluster.Name) - //client := op.Clients.KubernetesFor(kluster) - - //if err := ground.SeedAllowBootstrapTokensToPostCSRs(client); err != nil { - // return err - //} - - //if err := ground.SeedAutoApproveNodeBootstrapTokens(client); err != nil { - // return err - //} - - return nil -} - func (op *GroundControl) podAdd(obj interface{}) { pod := obj.(*api_v1.Pod) diff --git a/pkg/controller/operator.go b/pkg/controller/operator.go index 26bc023e3d..a8e7ad76bf 100644 --- a/pkg/controller/operator.go +++ b/pkg/controller/operator.go @@ -53,8 +53,6 @@ type KubernikusOperatorOptions struct { Namespace string Controllers []string MetricPort int - - logger log.Logger } type KubernikusOperator struct {