Skip to content

Commit f2947f8

Browse files
authored
Merge pull request #3357 from kubernetes-client/adal
Remove Azure authenticator because it is deprecated.
2 parents 5168112 + 835fd70 commit f2947f8

File tree

5 files changed

+0
-128
lines changed

5 files changed

+0
-128
lines changed

pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,6 @@
140140
<artifactId>bcpkix-jdk18on</artifactId>
141141
<version>${bouncycastle.version}</version>
142142
</dependency>
143-
<dependency>
144-
<groupId>com.microsoft.azure</groupId>
145-
<artifactId>adal4j</artifactId>
146-
<version>1.6.7</version>
147-
<optional>true</optional>
148-
</dependency>
149-
<!-- override the version in adal4j which has a CVE -->
150-
<dependency>
151-
<groupId>net.minidev</groupId>
152-
<artifactId>json-smart</artifactId>
153-
<version>2.5.1</version>
154-
<optional>true</optional>
155-
</dependency>
156143
<dependency>
157144
<groupId>com.amazonaws</groupId>
158145
<artifactId>aws-java-sdk-sts</artifactId>

util/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@
5757
<groupId>org.bouncycastle</groupId>
5858
<artifactId>bcpkix-jdk18on</artifactId>
5959
</dependency>
60-
<dependency>
61-
<groupId>com.microsoft.azure</groupId>
62-
<artifactId>adal4j</artifactId>
63-
</dependency>
6460
<dependency>
6561
<groupId>com.amazonaws</groupId>
6662
<artifactId>aws-java-sdk-sts</artifactId>

util/src/main/java/io/kubernetes/client/util/KubeConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.google.gson.JsonParser;
1919
import io.kubernetes.client.persister.ConfigPersister;
2020
import io.kubernetes.client.util.authenticators.Authenticator;
21-
import io.kubernetes.client.util.authenticators.AzureActiveDirectoryAuthenticator;
2221
import io.kubernetes.client.util.authenticators.GCPAuthenticator;
2322
import io.kubernetes.client.util.authenticators.OpenIDConnectAuthenticator;
2423
import java.io.File;
@@ -79,7 +78,6 @@ public static void registerAuthenticator(Authenticator auth) {
7978

8079
static {
8180
registerAuthenticator(new GCPAuthenticator());
82-
registerAuthenticator(new AzureActiveDirectoryAuthenticator());
8381
registerAuthenticator(new OpenIDConnectAuthenticator());
8482
}
8583

util/src/main/java/io/kubernetes/client/util/authenticators/AzureActiveDirectoryAuthenticator.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

util/src/test/java/io/kubernetes/client/util/KubeConfigTest.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.google.auth.oauth2.AccessToken;
1818
import com.google.auth.oauth2.GoogleCredentials;
1919
import io.kubernetes.client.util.authenticators.Authenticator;
20-
import io.kubernetes.client.util.authenticators.AzureActiveDirectoryAuthenticator;
2120
import io.kubernetes.client.util.authenticators.GCPAuthenticator;
2221
import java.io.ByteArrayInputStream;
2322
import java.io.FileReader;
@@ -210,30 +209,6 @@ void gcpAuthProviderExpiredTokenWithoutGCloud() {
210209
assertThat(kc.getCredentials()).containsEntry(KubeConfig.CRED_TOKEN_KEY, fakeToken);
211210
}
212211

213-
@Test
214-
void azureAuthProvider() {
215-
KubeConfig.registerAuthenticator(new AzureActiveDirectoryAuthenticator());
216-
String azureConfig =
217-
"apiVersion: v1\n"
218-
+ "contexts:\n"
219-
+ "- context:\n"
220-
+ " user: aks-cluster\n"
221-
+ " name: foo-context\n"
222-
+ "current-context: foo-context\n"
223-
+ "users:\n"
224-
+ "- name: aks-cluster\n"
225-
+ " user:\n"
226-
+ " auth-provider:\n"
227-
+ " config:\n"
228-
+ " access-token: fake-azure-token\n"
229-
+ " expires-on: \"1841569394\"\n"
230-
+ " expiry-key: '{.credential.token_expiry}'\n"
231-
+ " token-key: '{.credential.access_token}'\n"
232-
+ " name: azure\n";
233-
KubeConfig kc = KubeConfig.loadKubeConfig(new StringReader(azureConfig));
234-
assertThat(kc.getCredentials()).containsEntry(KubeConfig.CRED_TOKEN_KEY, "fake-azure-token");
235-
}
236-
237212
@Test
238213
void namespace() {
239214
KubeConfig config = KubeConfig.loadKubeConfig(new StringReader(KUBECONFIG_TOKEN));

0 commit comments

Comments
 (0)