13
13
package io .kubernetes .client .util ;
14
14
15
15
import io .kubernetes .client .ApiClient ;
16
+ import okio .ByteString ;
16
17
import org .apache .log4j .Logger ;
17
18
18
19
import javax .net .ssl .KeyManager ;
25
26
import java .io .InputStream ;
26
27
import java .io .InputStreamReader ;
27
28
import java .io .Reader ;
29
+ import java .nio .charset .Charset ;
28
30
29
31
public class Config {
30
32
public static final String SERVICEACCOUNT_ROOT =
@@ -38,6 +40,7 @@ public class Config {
38
40
public static final String ENV_SERVICE_PORT = "KUBERNETES_SERVICE_PORT" ;
39
41
// The last resort host to try
40
42
public static final String DEFAULT_FALLBACK_HOST = "http://localhost:8080" ;
43
+ public static final Charset BASIC_AUTH_CHARSET = Charset .forName ("ISO-8859-1" );
41
44
42
45
private static final Logger log = Logger .getLogger (Config .class );
43
46
@@ -75,8 +78,9 @@ public static ApiClient fromUserPassword(String url, String user, String passwor
75
78
76
79
public static ApiClient fromUserPassword (String url , String user , String password , boolean validateSSL ) {
77
80
ApiClient client = fromUrl (url , validateSSL );
78
- client .setUsername (user );
79
- client .setPassword (password );
81
+ final String usernameAndPassword = user + ":" + password ;
82
+ client .setApiKeyPrefix ("Basic" );
83
+ client .setApiKey (ByteString .of (usernameAndPassword .getBytes (BASIC_AUTH_CHARSET )).base64 ());
80
84
return client ;
81
85
}
82
86
@@ -86,7 +90,8 @@ public static ApiClient fromToken(String url, String token) {
86
90
87
91
public static ApiClient fromToken (String url , String token , boolean validateSSL ) {
88
92
ApiClient client = fromUrl (url , validateSSL );
89
- client .setAccessToken (token );
93
+ client .setApiKeyPrefix ("Bearer" );
94
+ client .setApiKey (token );
90
95
return client ;
91
96
}
92
97
0 commit comments