From d9dbcc08654861635b786203f20328586a532b43 Mon Sep 17 00:00:00 2001 From: Thiago Loureiro Date: Fri, 29 Mar 2019 20:20:50 +0100 Subject: [PATCH] Kubernetes Package, Code Cleanup (#845) --- src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs | 3 --- src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs | 4 ++-- src/Ocelot.Provider.Kubernetes/KubeProvider.cs | 1 - src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs | 2 -- src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs | 4 ++-- .../Ocelot.Provider.Kubernetes.csproj | 2 +- src/Ocelot.Provider.Kubernetes/PollKube.cs | 3 --- 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs b/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs index bd9089d0..56f17501 100644 --- a/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs +++ b/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs @@ -1,7 +1,4 @@ using KubeClient; -using System; -using System.Collections.Generic; -using System.Text; namespace Ocelot.Provider.Kubernetes { diff --git a/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs b/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs index fbb832ba..48719940 100644 --- a/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs +++ b/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs @@ -8,9 +8,9 @@ namespace Ocelot.Provider.Kubernetes { var option = new KubeClientOptions { - ApiEndPoint = config.ApiEndPoint + ApiEndPoint = config.ApiEndPoint }; - if(!string.IsNullOrEmpty(config?.AccessToken)) + if (!string.IsNullOrEmpty(config?.AccessToken)) { option.AccessToken = config.AccessToken; option.AuthStrategy = config.AuthStrategy; diff --git a/src/Ocelot.Provider.Kubernetes/KubeProvider.cs b/src/Ocelot.Provider.Kubernetes/KubeProvider.cs index 0d1f0fc4..388dfb6a 100644 --- a/src/Ocelot.Provider.Kubernetes/KubeProvider.cs +++ b/src/Ocelot.Provider.Kubernetes/KubeProvider.cs @@ -3,7 +3,6 @@ using KubeClient.Models; using Ocelot.Logging; using Ocelot.ServiceDiscovery.Providers; using Ocelot.Values; -using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs b/src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs index 929c6e32..8e5f800e 100644 --- a/src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs +++ b/src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs @@ -1,7 +1,5 @@ using KubeClient; using System; -using System.Collections.Generic; -using System.Text; namespace Ocelot.Provider.Kubernetes { diff --git a/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs b/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs index 30ed2c85..b0bb35d7 100644 --- a/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs +++ b/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs @@ -10,8 +10,8 @@ namespace Ocelot.Provider.Kubernetes { public static ServiceDiscoveryFinderDelegate Get = (provider, config, name) => { - var factory = provider.GetService(); - return GetkubeProvider(provider, config, name, factory); + var factory = provider.GetService(); + return GetkubeProvider(provider, config, name, factory); }; private static ServiceDiscovery.Providers.IServiceDiscoveryProvider GetkubeProvider(IServiceProvider provider, Configuration.ServiceProviderConfiguration config, string name, IOcelotLoggerFactory factory) diff --git a/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj b/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj index ffb981d3..dbe39207 100644 --- a/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj +++ b/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj @@ -16,7 +16,7 @@ win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64 false false - false + true false 0.0.0-dev geffzhang diff --git a/src/Ocelot.Provider.Kubernetes/PollKube.cs b/src/Ocelot.Provider.Kubernetes/PollKube.cs index a2096e9e..31d42a56 100644 --- a/src/Ocelot.Provider.Kubernetes/PollKube.cs +++ b/src/Ocelot.Provider.Kubernetes/PollKube.cs @@ -1,9 +1,7 @@ using Ocelot.Logging; using Ocelot.ServiceDiscovery.Providers; using Ocelot.Values; -using System; using System.Collections.Generic; -using System.Text; using System.Threading; using System.Threading.Tasks; @@ -47,4 +45,3 @@ namespace Ocelot.Provider.Kubernetes } } } -