diff --git a/src/Ocelot.Administration/Ocelot.Administration.csproj b/src/Ocelot.Administration/Ocelot.Administration.csproj index e2b8ed463..08e3c9938 100644 --- a/src/Ocelot.Administration/Ocelot.Administration.csproj +++ b/src/Ocelot.Administration/Ocelot.Administration.csproj @@ -42,7 +42,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj b/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj index 0e8d704ee..92fdb9b7a 100644 --- a/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj +++ b/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj @@ -61,8 +61,8 @@ - - + + diff --git a/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs b/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs deleted file mode 100644 index 56f175014..000000000 --- a/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs +++ /dev/null @@ -1,9 +0,0 @@ -using KubeClient; - -namespace Ocelot.Provider.Kubernetes -{ - public interface IKubeApiClientFactory - { - IKubeApiClient Get(KubeRegistryConfiguration config); - } -} diff --git a/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs b/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs deleted file mode 100644 index 48719940c..000000000 --- a/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -using KubeClient; - -namespace Ocelot.Provider.Kubernetes -{ - public class KubeApiClientFactory : IKubeApiClientFactory - { - public IKubeApiClient Get(KubeRegistryConfiguration config) - { - var option = new KubeClientOptions - { - ApiEndPoint = config.ApiEndPoint - }; - if (!string.IsNullOrEmpty(config?.AccessToken)) - { - option.AccessToken = config.AccessToken; - option.AuthStrategy = config.AuthStrategy; - option.AllowInsecure = config.AllowInsecure; - } - return KubeApiClient.Create(option); - } - } -} diff --git a/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj b/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj index 4941194e9..d3e2ce806 100644 --- a/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj +++ b/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj @@ -24,10 +24,6 @@ True 1591 - - - - diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj index 2171a5f62..82bfb452f 100644 --- a/src/Ocelot/Ocelot.csproj +++ b/src/Ocelot/Ocelot.csproj @@ -43,8 +43,8 @@ - - + + @@ -53,8 +53,8 @@ - - + + diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index 968fd5e79..4a2955773 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -74,8 +74,8 @@ - - + + @@ -100,14 +100,14 @@ - - + + - - - - + + + + diff --git a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj index 0b5f20d0e..e09b6ac15 100644 --- a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj +++ b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj @@ -56,7 +56,8 @@ - + + @@ -68,6 +69,7 @@ + @@ -78,13 +80,14 @@ - + + - - - - + + + + diff --git a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj index 45b21c6a5..aceeab861 100644 --- a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj +++ b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj @@ -38,6 +38,7 @@ + @@ -48,6 +49,7 @@ + @@ -58,12 +60,13 @@ + - - - - + + + + diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj index 2ba5a4959..909c6081b 100644 --- a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj +++ b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj @@ -80,8 +80,8 @@ - - + + @@ -104,14 +104,14 @@ - - + + - - - - + + + +