From bd7e18ca42642921b5ae19f9a092e5e736e51826 Mon Sep 17 00:00:00 2001 From: geffzhang <136590076@qq.com> Date: Wed, 30 Jan 2019 07:36:19 +0800 Subject: [PATCH] keep the configuration as simple as possible, no qos, no cache --- samples/OelotKube/ApiGateway/ApiGateway.csproj | 1 - samples/OelotKube/ApiGateway/Startup.cs | 2 -- samples/OelotKube/ApiGateway/ocelot.json | 8 +------- samples/OelotKube/OelotKube.sln | 6 ------ 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/samples/OelotKube/ApiGateway/ApiGateway.csproj b/samples/OelotKube/ApiGateway/ApiGateway.csproj index ab5b5e80..aef8c150 100644 --- a/samples/OelotKube/ApiGateway/ApiGateway.csproj +++ b/samples/OelotKube/ApiGateway/ApiGateway.csproj @@ -14,7 +14,6 @@ - diff --git a/samples/OelotKube/ApiGateway/Startup.cs b/samples/OelotKube/ApiGateway/Startup.cs index 6b7b68f2..4743e836 100644 --- a/samples/OelotKube/ApiGateway/Startup.cs +++ b/samples/OelotKube/ApiGateway/Startup.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.DependencyInjection; using Ocelot.DependencyInjection; using Ocelot.Middleware; using Ocelot.Provider.Kubernetes; -using Ocelot.Provider.Polly; namespace ApiGateway { @@ -20,7 +19,6 @@ namespace ApiGateway public void ConfigureServices(IServiceCollection services) { services.AddOcelot() - .AddPolly() .AddKubernetes(); } diff --git a/samples/OelotKube/ApiGateway/ocelot.json b/samples/OelotKube/ApiGateway/ocelot.json index eabb960b..efe3f36f 100644 --- a/samples/OelotKube/ApiGateway/ocelot.json +++ b/samples/OelotKube/ApiGateway/ocelot.json @@ -5,13 +5,7 @@ "DownstreamScheme": "http", "UpstreamPathTemplate": "/values", "ServiceName": "downstreamservice", - "UpstreamHttpMethod": [ "Get" ], - "QoSOptions": { - "ExceptionsAllowedBeforeBreaking": 3, - "DurationOfBreak": 10000, - "TimeoutValue": 5000 - }, - "FileCacheOptions": { "TtlSeconds": 15 } + "UpstreamHttpMethod": [ "Get" ] } ], "GlobalConfiguration": { diff --git a/samples/OelotKube/OelotKube.sln b/samples/OelotKube/OelotKube.sln index 2bb63eff..aa57e0dd 100644 --- a/samples/OelotKube/OelotKube.sln +++ b/samples/OelotKube/OelotKube.sln @@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot", "..\..\src\Ocelot\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Kubernetes", "..\..\src\Ocelot.Provider.Kubernetes\Ocelot.Provider.Kubernetes.csproj", "{EF973868-98A6-4864-BF66-65B5A8C123FE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Polly", "..\..\src\Ocelot.Provider.Polly\Ocelot.Provider.Polly.csproj", "{323055CB-BF62-4A31-A619-A4444B633CDB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownstreamService", "DownstreamService\DownstreamService.csproj", "{86FFAE3C-648F-4CDE-A260-37C8EBFBF4F2}" EndProject Global @@ -31,10 +29,6 @@ Global {EF973868-98A6-4864-BF66-65B5A8C123FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF973868-98A6-4864-BF66-65B5A8C123FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {EF973868-98A6-4864-BF66-65B5A8C123FE}.Release|Any CPU.Build.0 = Release|Any CPU - {323055CB-BF62-4A31-A619-A4444B633CDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {323055CB-BF62-4A31-A619-A4444B633CDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {323055CB-BF62-4A31-A619-A4444B633CDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {323055CB-BF62-4A31-A619-A4444B633CDB}.Release|Any CPU.Build.0 = Release|Any CPU {86FFAE3C-648F-4CDE-A260-37C8EBFBF4F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {86FFAE3C-648F-4CDE-A260-37C8EBFBF4F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {86FFAE3C-648F-4CDE-A260-37C8EBFBF4F2}.Release|Any CPU.ActiveCfg = Release|Any CPU