Skip to content

Commit 034a292

Browse files
authored
Merge pull request #960 from yue9944882/chore/pin-default-protocol-to-http1
Defaulting okhttp client protocols to HTTP1.1
2 parents 965b350 + 3561094 commit 034a292

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
*/
1313
package io.kubernetes.client.util;
1414

15-
import static io.kubernetes.client.util.Config.ENV_KUBECONFIG;
16-
import static io.kubernetes.client.util.Config.ENV_SERVICE_HOST;
17-
import static io.kubernetes.client.util.Config.ENV_SERVICE_PORT;
18-
import static io.kubernetes.client.util.Config.SERVICEACCOUNT_CA_PATH;
19-
import static io.kubernetes.client.util.Config.SERVICEACCOUNT_TOKEN_PATH;
15+
import static io.kubernetes.client.util.Config.*;
2016
import static io.kubernetes.client.util.KubeConfig.ENV_HOME;
2117
import static io.kubernetes.client.util.KubeConfig.KUBECONFIG;
2218
import static io.kubernetes.client.util.KubeConfig.KUBEDIR;
@@ -31,12 +27,15 @@
3127
import java.io.FileInputStream;
3228
import java.io.IOException;
3329
import java.io.InputStreamReader;
30+
import java.io.Reader;
3431
import java.net.URI;
3532
import java.net.URISyntaxException;
3633
import java.nio.charset.Charset;
3734
import java.nio.charset.StandardCharsets;
3835
import java.nio.file.Files;
3936
import java.nio.file.Paths;
37+
import java.util.Arrays;
38+
import okhttp3.Protocol;
4039
import org.slf4j.Logger;
4140
import org.slf4j.LoggerFactory;
4241

@@ -292,6 +291,10 @@ public ClientBuilder setVerifyingSsl(boolean verifyingSsl) {
292291
public ApiClient build() {
293292
final ApiClient client = new ApiClient();
294293

294+
// defaulting client protocols to HTTP1.1
295+
client.setHttpClient(
296+
client.getHttpClient().newBuilder().protocols(Arrays.asList(Protocol.HTTP_1_1)).build());
297+
295298
if (basePath != null) {
296299
if (basePath.endsWith("/")) {
297300
basePath = basePath.substring(0, basePath.length() - 1);

0 commit comments

Comments
 (0)