tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-23 00:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/13.5.0'

Browse Source
This commit is contained in:
Thiago Loureiro de Azevedo 2019-03-30 10:37:09 +01:00
commit 5db449b000
10 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ocelot.Provider.Eureka/EurekaMiddlewareConfigurationProvider.cs
View File

@ -5,7 +5,7 @@
using Configuration.Repository;
using Microsoft.Extensions.DependencyInjection;
using Middleware;
using Pivotal.Discovery.Client;
using Steeltoe.Discovery.Client;
public class EurekaMiddlewareConfigurationProvider
{

2
src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj
View File

@ -29,7 +29,7 @@
<ProjectReference Include="..\Ocelot\Ocelot.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
<PackageReference Include="Steeltoe.Discovery.ClientCore" Version="2.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

2
src/Ocelot.Provider.Eureka/OcelotBuilderExtensions.cs
View File

@ -5,7 +5,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Middleware;
using Pivotal.Discovery.Client;
using Steeltoe.Discovery.Client;
using ServiceDiscovery;
public static class OcelotBuilderExtensions

3
src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs
View File

@ -1,7 +1,4 @@
using KubeClient;
using System;
using System.Collections.Generic;
using System.Text;
namespace Ocelot.Provider.Kubernetes
{

2
src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs
View File

@ -10,7 +10,7 @@ namespace Ocelot.Provider.Kubernetes
{
ApiEndPoint = config.ApiEndPoint
};
if(!string.IsNullOrEmpty(config?.AccessToken))
if (!string.IsNullOrEmpty(config?.AccessToken))
{
option.AccessToken = config.AccessToken;
option.AuthStrategy = config.AuthStrategy;

1
src/Ocelot.Provider.Kubernetes/KubeProvider.cs
View File

@ -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;

2
src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs
View File

@ -1,7 +1,5 @@
using KubeClient;
using System;
using System.Collections.Generic;
using System.Text;
namespace Ocelot.Provider.Kubernetes
{

2
src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj
View File

@ -16,7 +16,7 @@
<RuntimeIdentifiers>win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64</RuntimeIdentifiers>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<Version>0.0.0-dev</Version>
<Authors>geffzhang</Authors>

3
src/Ocelot.Provider.Kubernetes/PollKube.cs
View File

@ -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
}
}
}