mirror of
https://github.com/nsnail/Ocelot.git
synced 2025-11-04 23:50:49 +08:00
Release/13.6.0 (#895)
* Fixed Format Issue for Kubernetes ServiceDiscoveryProvider
* Fixes broken links (#858)
* Fix link to issue 262
* Fixes broken link to issue 340
* Fixed broken link to issue 340 (#857)
* Update information for Okta Authorization (#853)
* +dynamic claim variables (#855)
incl. tests
* IOcelotPipelineBuilder.Use(): Return IOcelotPipelineBuilder (#875)
Fixes ThreeMammals/Ocelot#685
* Fix UpstreamHost checking when reroutes duplicate validation (#864)
* Format json in reame (#877)
Format json file in AdministrationApi ReadMe
* kubernetes use in cluster (#882)
* refactor ：kubernetes use in cluster
* feat：delete KubeClient
* add more flexible method to config ocelot pipeline (#880)
* update k8s doc & samples (#885)
* refactor ：kubernetes use in cluster
* feat：delete KubeClient
* feat : update k8s doc & samples
* Update kubernetes.rst
* Fix/issue666 (#889)
* cache key now can generate from query string for request with Get Methods and request content for requests with post methods
* MD5Helper Added. OutputCacheMiddleware now can generate cache key using method, url and content
* unit test created for CacheKeyGenerator
* CacheKeyGenerator Registered in OcelotBuilder as singletone
* Fix issue #890 IDefinedAggregator can't handle error codes from downstream requests (#892)
* Release/13.2.0 (#834)
* Fix formatting in getting started page (#752)
* updated release docs (#745)
* Update README.md (#756)
Fixed typo "Ocleot"
* Fixed typo there => their (#763)
* Some Typo fixes (#765)
* Typo algorythm => algorithm (#764)
* Typo querystring => query string (#766)
* Typo usual => usually (#767)
* Typos (#768)
* kubernetes provider (#772)
* feat: Kubernetes ServiceDiscoveryProvider
* 编写k8s测试例子
* feat：fix kube config
* feat： remove port
* feat ： complete the k8s test
* feat : add kubeserviceDiscovery test
* feat : add kube provider unittest
* feat :add kubetnetes docs
how to use ocelot with kubetnetes docs
* keep the configuration as simple as possible, no qos, no cache
* fix: use http
* add PollingKubeServiceDiscovery
* feat : refactor logger
* feat : add pollkube docs
* feat：Remove unnecessary code
* feat ： code-block json
* fix issue #661 for Advanced aggregations (#704)
* Add Advanced Aggregation Feature
* fix overwrite error
* distinct data for better performance
* remove constructor parameter
* fix tests issue
* fix tests
* fix tests issue
* Add UnitTest and AcceptanceTest
* fix responseKeys typo
* Update SimpleJsonResponseAggregator.cs
* change port
* Fix code example for SSL Errors (#780)
DangerousAcceptAnyServerCertificateValidator has to be set to "true" to disable certification validation, not "false".
* Changed wording for ease of reading (#776)
Just some wording changes for clarification.
* Ignore response content if null (fix #785) (#786)
* fix bug #791 (#795)
* Update loadbalancer.rst (#796)
* UriBuilder - remove leading question mark #747 (#794)
* Update qualityofservice.rst (#801)
Tiny typo
* K8s package (#804)
* feat: Kubernetes ServiceDiscoveryProvider
* 编写k8s测试例子
* feat：fix kube config
* feat： remove port
* feat ： complete the k8s test
* feat : add kubeserviceDiscovery test
* feat : add kube provider unittest
* feat :add kubetnetes docs
how to use ocelot with kubetnetes docs
* keep the configuration as simple as possible, no qos, no cache
* fix: use http
* add PollingKubeServiceDiscovery
* feat : refactor logger
* feat : add pollkube docs
* feat：Remove unnecessary code
* feat ： code-block json
* feat： publish package Ocelot.Provider.Kubernetes
* Okta integration (#807)
Okta integration
* update cliamsParser (#798)
* update cliamsParser
* update using
* IOcelotBuilder opens the IMvcCoreBuilder property for easy customization (#790)
* IOcelotBuilder opens the IMvcCoreBuilder property for easy customization
* Adjustment code
* nuget package (#809)
* feat: Kubernetes ServiceDiscoveryProvider
* 编写k8s测试例子
* feat：fix kube config
* feat： remove port
* feat ： complete the k8s test
* feat : add kubeserviceDiscovery test
* feat : add kube provider unittest
* feat :add kubetnetes docs
how to use ocelot with kubetnetes docs
* keep the configuration as simple as possible, no qos, no cache
* fix: use http
* add PollingKubeServiceDiscovery
* feat : refactor logger
* feat : add pollkube docs
* feat：Remove unnecessary code
* feat ： code-block json
* feat： publish package Ocelot.Provider.Kubernetes
* feat : nuget package
* fix： Namesapce Spelling wrong
* fix：Namesapce Spelling Wrong
* Fix: errors when using rate limiting (#811)
* Fix: errors when using rate limiting
Add: QuotaExceededError class for requesting too much
Add: QuotaExceededError error code
Add: Add an error when limit is reached
Reflact: Extract GetResponseMessage method for getting default or configured response message for requ
* Fix: modify check_we_have_considered_all_errors_in_these_tests for adding a new OcelotErrorCode
* added missing COPY csproj files (#821)
* Add note on In-Process hosting (#816)
When using ASP.NET Core 2.2 with In-Process hosting in IIS it's important to use .UseIIS() instead of .UseIISIntegration().
* Fix bug： (#810)
If the registered Consul node is unexpectedly down and not restarted immediately, other services should continue to find the registered service.
* Fixed Dockerfile (missing Kubernetes)
* Revert "Fix bug： (#810)" (#823)
This reverts commit 19c80afb05.
* remove duplicate `IHttpRequester` register (#819)
* remove duplicate `IHttpRequester` register
* reserve the first
* fix HttpRequesterMiddleware does not call next bug (#830)
call next so that we can do something with the response, such as add some custom header etc...
* Removed Packing to fix issues, will be sorted out after create a nuget package on Nuget.Org (#831)
* Allows access to unpass node (#825)
* Fix bug：
If the registered Consul node is unexpectedly down and not restarted immediately, other services should continue to find the registered service.
* fix bug：
If the registered Consul node is unexpectedly down and not restarted immediately, other services should continue to find the registered service.
* Updated FluentValidations Nuget Package (#833)
* Removed Warnings
* Make the full DownstreamContext available to user defined aggregators
This allows error codes to be handled
This commit is contained in:
Thiago Loureiro
@@ -15,13 +15,14 @@ namespace Ocelot.Provider.Kubernetes
|
||||
private IOcelotLogger logger;
|
||||
private IKubeApiClient kubeApi;
|
||||
|
||||
public Kube(KubeRegistryConfiguration kubeRegistryConfiguration, IOcelotLoggerFactory factory, IKubeApiClientFactory kubeClientFactory)
|
||||
public Kube(KubeRegistryConfiguration kubeRegistryConfiguration, IOcelotLoggerFactory factory, IKubeApiClient kubeApi)
|
||||
{
|
||||
this.kubeRegistryConfiguration = kubeRegistryConfiguration;
|
||||
this.logger = factory.CreateLogger<Kube>();
|
||||
this.kubeApi = kubeClientFactory.Get(kubeRegistryConfiguration);
|
||||
this.kubeApi = kubeApi;
|
||||
}
|
||||
|
||||
|
||||
public async Task<List<Service>> Get()
|
||||
{
|
||||
var service = await kubeApi.ServicesV1()
|
||||
|
||||
@@ -5,16 +5,8 @@ namespace Ocelot.Provider.Kubernetes
|
||||
{
|
||||
public class KubeRegistryConfiguration
|
||||
{
|
||||
public Uri ApiEndPoint { get; set; }
|
||||
|
||||
public string KubeNamespace { get; set; }
|
||||
|
||||
public string KeyOfServiceInK8s { get; set; }
|
||||
|
||||
public KubeAuthStrategy AuthStrategy { get; set; }
|
||||
|
||||
public string AccessToken { get; set; }
|
||||
|
||||
public bool AllowInsecure { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,18 +16,14 @@ namespace Ocelot.Provider.Kubernetes
|
||||
|
||||
private static ServiceDiscovery.Providers.IServiceDiscoveryProvider GetkubeProvider(IServiceProvider provider, Configuration.ServiceProviderConfiguration config, string name, IOcelotLoggerFactory factory)
|
||||
{
|
||||
var kubeClientFactory = provider.GetService<IKubeApiClientFactory>();
|
||||
var kubeClient = provider.GetService<IKubeApiClient>();
|
||||
var k8sRegistryConfiguration = new KubeRegistryConfiguration()
|
||||
{
|
||||
ApiEndPoint = new Uri($"https://{config.Host}:{config.Port}"),
|
||||
KeyOfServiceInK8s = name,
|
||||
KubeNamespace = config.Namespace,
|
||||
AuthStrategy = KubeAuthStrategy.BearerToken,
|
||||
AccessToken = config.Token,
|
||||
AllowInsecure = true // Don't validate server certificate
|
||||
};
|
||||
|
||||
var k8sServiceDiscoveryProvider = new Kube(k8sRegistryConfiguration, factory, kubeClientFactory);
|
||||
var k8sServiceDiscoveryProvider = new Kube(k8sRegistryConfiguration, factory, kubeClient);
|
||||
if (config.Type?.ToLower() == "pollkube")
|
||||
{
|
||||
return new PollKube(config.PollingInterval, factory, k8sServiceDiscoveryProvider);
|
||||
|
||||
@@ -25,7 +25,13 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="KubeClient" Version="2.2.4" />
|
||||
<Compile Remove="IKubeApiClientFactory.cs" />
|
||||
<Compile Remove="KubeApiClientFactory.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="KubeClient" Version="2.2.11" />
|
||||
<PackageReference Include="KubeClient.Extensions.DependencyInjection" Version="2.2.11" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using KubeClient;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Ocelot.DependencyInjection;
|
||||
|
||||
namespace Ocelot.Provider.Kubernetes
|
||||
{
|
||||
public static class OcelotBuilderExtensions
|
||||
{
|
||||
public static IOcelotBuilder AddKubernetes(this IOcelotBuilder builder)
|
||||
public static IOcelotBuilder AddKubernetes(this IOcelotBuilder builder, bool usePodServiceAccount = true)
|
||||
{
|
||||
builder.Services.AddSingleton(KubernetesProviderFactory.Get);
|
||||
builder.Services.AddSingleton<IKubeApiClientFactory, KubeApiClientFactory>();
|
||||
builder.Services.AddKubeClient(usePodServiceAccount);
|
||||
return builder;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user