Skip to content

Commit

Permalink
align auth provider with go-client (#1415)
Browse files Browse the repository at this point in the history
* remove unsupport provider

* fix build

* fix missing

* rm unused
  • Loading branch information
tg123 authored Oct 2, 2023
1 parent 2899a13 commit da71e32
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 143 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<Compile Include="..\KubernetesClient\Exceptions\KubernetesClientException.cs" />

<Compile Include="..\KubernetesClient\Authentication\ExecTokenProvider.cs" />
<Compile Include="..\KubernetesClient\Authentication\GcpTokenProvider.cs" />
<Compile Include="..\KubernetesClient\Authentication\OidcTokenProvider.cs" />
<Compile Include="..\KubernetesClient\Authentication\TokenFileAuth.cs" />
<Compile Include="..\KubernetesClient\Authentication\BasicAuthenticationCredentials.cs" />
Expand Down
72 changes: 0 additions & 72 deletions src/KubernetesClient/Authentication/GcpTokenProvider.cs

This file was deleted.

44 changes: 2 additions & 42 deletions src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -384,45 +384,10 @@ private void SetUserDetails(K8SConfiguration k8SConfig, Context activeContext)
switch (userDetails.UserCredentials.AuthProvider.Name)
{
case "azure":
{
var config = userDetails.UserCredentials.AuthProvider.Config;
if (config.ContainsKey("expires-on"))
{
var expiresOn = int.Parse(config["expires-on"]);
DateTimeOffset expires;
expires = DateTimeOffset.FromUnixTimeSeconds(expiresOn);

if (DateTimeOffset.Compare(
expires,
DateTimeOffset.Now)
<= 0)
{
var tenantId = config["tenant-id"];
var clientId = config["client-id"];
var apiServerId = config["apiserver-id"];
var refresh = config["refresh-token"];
var newToken = RenewAzureToken(
tenantId,
clientId,
apiServerId,
refresh);
config["access-token"] = newToken;
}
}

AccessToken = config["access-token"];
userCredentialsFound = true;
break;
}
throw new Exception("Please use the https://github.com/Azure/kubelogin credential plugin instead. See https://kubernetes.io/docs/reference/access-authn-authz/authentication/#client-go-credential-plugins for further details`");

case "gcp":
{
// config
var config = userDetails.UserCredentials.AuthProvider.Config;
TokenProvider = new GcpTokenProvider(config["cmd-path"]);
userCredentialsFound = true;
break;
}
throw new Exception("Please use the \"gke-gcloud-auth-plugin\" credential plugin instead. See https://cloud.google.com/blog/products/containers-kubernetes/kubectl-auth-changes-in-gke for further details");

case "oidc":
{
Expand Down Expand Up @@ -487,11 +452,6 @@ private void SetUserDetails(K8SConfiguration k8SConfig, Context activeContext)
}
}

public static string RenewAzureToken(string tenantId, string clientId, string apiServerId, string refresh)
{
throw new KubeConfigException("Refresh not supported.");
}

public static Process CreateRunnableExternalProcess(ExternalExecution config, EventHandler<DataReceivedEventArgs> captureStdError = null)
{
if (config == null)
Expand Down
28 changes: 0 additions & 28 deletions tests/KubernetesClient.Tests/GcpTokenProviderTests.cs

This file was deleted.

0 comments on commit da71e32

Please sign in to comment.