From cfcddff2b0b48227475055270912d9aead505733 Mon Sep 17 00:00:00 2001 From: Boshi LIAN Date: Wed, 25 Oct 2023 13:38:21 -0700 Subject: [PATCH 1/3] full clone cacert from config ojb --- src/KubernetesClient/Kubernetes.ConfigInit.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/KubernetesClient/Kubernetes.ConfigInit.cs b/src/KubernetesClient/Kubernetes.ConfigInit.cs index 8d6fa31a8..5f6a5231b 100644 --- a/src/KubernetesClient/Kubernetes.ConfigInit.cs +++ b/src/KubernetesClient/Kubernetes.ConfigInit.cs @@ -23,16 +23,21 @@ public Kubernetes(KubernetesClientConfiguration config, params DelegatingHandler { Initialize(); ValidateConfig(config); - CaCerts = config.SslCaCerts; + + if (config.SslCaCerts != null) + { + CaCerts = new X509Certificate2Collection(config.SslCaCerts.Select(c => new X509Certificate2(c)).ToArray()); + } + SkipTlsVerify = config.SkipTlsVerify; TlsServerName = config.TlsServerName; CreateHttpClient(handlers, config); InitializeFromConfig(config); HttpClientTimeout = config.HttpClientTimeout; jsonSerializerOptions = config.JsonSerializerOptions; -#if NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER + #if NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER DisableHttp2 = config.DisableHttp2; -#endif + #endif } private void ValidateConfig(KubernetesClientConfiguration config) From 93170e0fda2e9d390423aceab68ea36687101494 Mon Sep 17 00:00:00 2001 From: Boshi LIAN Date: Wed, 25 Oct 2023 13:56:09 -0700 Subject: [PATCH 2/3] happy net48 --- src/KubernetesClient/Kubernetes.ConfigInit.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/KubernetesClient/Kubernetes.ConfigInit.cs b/src/KubernetesClient/Kubernetes.ConfigInit.cs index 5f6a5231b..e5e633004 100644 --- a/src/KubernetesClient/Kubernetes.ConfigInit.cs +++ b/src/KubernetesClient/Kubernetes.ConfigInit.cs @@ -26,7 +26,11 @@ public Kubernetes(KubernetesClientConfiguration config, params DelegatingHandler if (config.SslCaCerts != null) { - CaCerts = new X509Certificate2Collection(config.SslCaCerts.Select(c => new X509Certificate2(c)).ToArray()); + var caCerts = new X509Certificate2Collection(); + foreach (var cert in config.SslCaCerts) + { + caCerts.Add(new X509Certificate2(cert)); + } } SkipTlsVerify = config.SkipTlsVerify; @@ -35,9 +39,9 @@ public Kubernetes(KubernetesClientConfiguration config, params DelegatingHandler InitializeFromConfig(config); HttpClientTimeout = config.HttpClientTimeout; jsonSerializerOptions = config.JsonSerializerOptions; - #if NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER +#if NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER DisableHttp2 = config.DisableHttp2; - #endif +#endif } private void ValidateConfig(KubernetesClientConfiguration config) From 150e3e192309d76fb9dff71b02a8cc8d35a4d02a Mon Sep 17 00:00:00 2001 From: Boshi LIAN Date: Wed, 25 Oct 2023 13:57:20 -0700 Subject: [PATCH 3/3] blame copilot --- src/KubernetesClient/Kubernetes.ConfigInit.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/KubernetesClient/Kubernetes.ConfigInit.cs b/src/KubernetesClient/Kubernetes.ConfigInit.cs index e5e633004..da36c9fcf 100644 --- a/src/KubernetesClient/Kubernetes.ConfigInit.cs +++ b/src/KubernetesClient/Kubernetes.ConfigInit.cs @@ -31,6 +31,8 @@ public Kubernetes(KubernetesClientConfiguration config, params DelegatingHandler { caCerts.Add(new X509Certificate2(cert)); } + + CaCerts = caCerts; } SkipTlsVerify = config.SkipTlsVerify;