natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: upgrade kubernetes-client to 6.6.0 (#12287) 

* chore: upgrade kubernetes-client to 6.6.0

* style: reformat org.apache.dubbo.registry.kubernetes.util.KubernetesConfigUtils
This commit is contained in:
conghuhu 2023-05-11 19:05:16 +08:00 committed by GitHub
parent f69bed98a7
commit 7c66d1a968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dubbo-dependencies-bom/pom.xml
View File

@ -167,7 +167,7 @@
<eureka.version>1.10.18</eureka.version>
<!-- Fabric8 for Kubernetes -->
<fabric8_kubernetes_version>6.4.1</fabric8_kubernetes_version>
<fabric8_kubernetes_version>6.6.0</fabric8_kubernetes_version>
<!-- Alibaba -->
<alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version>

64
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesConfigUtils.java
View File

@ -47,7 +47,6 @@ import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.PA
import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.PROXY_PASSWORD;
import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.PROXY_USERNAME;
import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.REQUEST_TIMEOUT;
import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.ROLLING_TIMEOUT;
import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.TRUST_CERTS;
import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.USERNAME;
import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.USE_HTTPS;
@ -62,43 +61,42 @@ public class KubernetesConfigUtils {
// replace config with parameters if presents
return new ConfigBuilder(base) //
.withMasterUrl(buildMasterUrl(url)) //
.withApiVersion(url.getParameter(API_VERSION, base.getApiVersion())) //
.withNamespace(url.getParameter(NAMESPACE, base.getNamespace())) //
.withUsername(url.getParameter(USERNAME, base.getUsername())) //
.withPassword(url.getParameter(PASSWORD, base.getPassword())) //
.withMasterUrl(buildMasterUrl(url)) //
.withApiVersion(url.getParameter(API_VERSION, base.getApiVersion())) //
.withNamespace(url.getParameter(NAMESPACE, base.getNamespace())) //
.withUsername(url.getParameter(USERNAME, base.getUsername())) //
.withPassword(url.getParameter(PASSWORD, base.getPassword())) //
.withOauthToken(url.getParameter(OAUTH_TOKEN, base.getOauthToken())) //
.withOauthToken(url.getParameter(OAUTH_TOKEN, base.getOauthToken())) //
.withCaCertFile(url.getParameter(CA_CERT_FILE, base.getCaCertFile())) //
.withCaCertData(url.getParameter(CA_CERT_DATA, decodeBase64(base.getCaCertData()))) //
.withCaCertFile(url.getParameter(CA_CERT_FILE, base.getCaCertFile())) //
.withCaCertData(url.getParameter(CA_CERT_DATA, decodeBase64(base.getCaCertData()))) //
.withClientKeyFile(url.getParameter(CLIENT_KEY_FILE, base.getClientKeyFile())) //
.withClientKeyData(url.getParameter(CLIENT_KEY_DATA, decodeBase64(base.getClientKeyData()))) //
.withClientKeyFile(url.getParameter(CLIENT_KEY_FILE, base.getClientKeyFile())) //
.withClientKeyData(url.getParameter(CLIENT_KEY_DATA, decodeBase64(base.getClientKeyData()))) //
.withClientCertFile(url.getParameter(CLIENT_CERT_FILE, base.getClientCertFile())) //
.withClientCertData(url.getParameter(CLIENT_CERT_DATA, decodeBase64(base.getClientCertData()))) //
.withClientCertFile(url.getParameter(CLIENT_CERT_FILE, base.getClientCertFile())) //
.withClientCertData(url.getParameter(CLIENT_CERT_DATA, decodeBase64(base.getClientCertData()))) //
.withClientKeyAlgo(url.getParameter(CLIENT_KEY_ALGO, base.getClientKeyAlgo())) //
.withClientKeyPassphrase(url.getParameter(CLIENT_KEY_PASSPHRASE, base.getClientKeyPassphrase())) //
.withClientKeyAlgo(url.getParameter(CLIENT_KEY_ALGO, base.getClientKeyAlgo())) //
.withClientKeyPassphrase(url.getParameter(CLIENT_KEY_PASSPHRASE, base.getClientKeyPassphrase())) //
.withConnectionTimeout(url.getParameter(CONNECTION_TIMEOUT, base.getConnectionTimeout())) //
.withRequestTimeout(url.getParameter(REQUEST_TIMEOUT, base.getRequestTimeout())) //
.withRollingTimeout(url.getParameter(ROLLING_TIMEOUT, base.getRollingTimeout())) //
.withConnectionTimeout(url.getParameter(CONNECTION_TIMEOUT, base.getConnectionTimeout())) //
.withRequestTimeout(url.getParameter(REQUEST_TIMEOUT, base.getRequestTimeout())) //
.withWatchReconnectInterval(url.getParameter(WATCH_RECONNECT_INTERVAL, base.getWatchReconnectInterval())) //
.withWatchReconnectLimit(url.getParameter(WATCH_RECONNECT_LIMIT, base.getWatchReconnectLimit())) //
.withLoggingInterval(url.getParameter(LOGGING_INTERVAL, base.getLoggingInterval())) //
.withWatchReconnectInterval(url.getParameter(WATCH_RECONNECT_INTERVAL, base.getWatchReconnectInterval())) //
.withWatchReconnectLimit(url.getParameter(WATCH_RECONNECT_LIMIT, base.getWatchReconnectLimit())) //
.withLoggingInterval(url.getParameter(LOGGING_INTERVAL, base.getLoggingInterval())) //
.withTrustCerts(url.getParameter(TRUST_CERTS, base.isTrustCerts())) //
.withHttp2Disable(url.getParameter(HTTP2_DISABLE, base.isTrustCerts())) //
.withTrustCerts(url.getParameter(TRUST_CERTS, base.isTrustCerts())) //
.withHttp2Disable(url.getParameter(HTTP2_DISABLE, base.isTrustCerts())) //
.withHttpProxy(url.getParameter(HTTP_PROXY, base.getHttpProxy())) //
.withHttpsProxy(url.getParameter(HTTPS_PROXY, base.getHttpsProxy())) //
.withProxyUsername(url.getParameter(PROXY_USERNAME, base.getProxyUsername())) //
.withProxyPassword(url.getParameter(PROXY_PASSWORD, base.getProxyPassword())) //
.withNoProxy(url.getParameter(NO_PROXY, base.getNoProxy())) //
.build();
.withHttpProxy(url.getParameter(HTTP_PROXY, base.getHttpProxy())) //
.withHttpsProxy(url.getParameter(HTTPS_PROXY, base.getHttpsProxy())) //
.withProxyUsername(url.getParameter(PROXY_USERNAME, base.getProxyUsername())) //
.withProxyPassword(url.getParameter(PROXY_PASSWORD, base.getProxyPassword())) //
.withNoProxy(url.getParameter(NO_PROXY, base.getNoProxy())) //
.build();
}
private static String buildMasterUrl(URL url) {
@ -106,13 +104,13 @@ public class KubernetesConfigUtils {
return DEFAULT_MASTER_URL;
}
return (url.getParameter(USE_HTTPS, true) ?
"https://" : "http://")
+ url.getHost() + ":" + url.getPort();
"https://" : "http://")
+ url.getHost() + ":" + url.getPort();
}
private static String decodeBase64(String str) {
return StringUtils.isNotEmpty(str) ?
new String(Base64.getDecoder().decode(str)) :
null;
new String(Base64.getDecoder().decode(str)) :
null;
}
}

1
dubbo-kubernetes/src/test/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryTest.java
View File

@ -52,6 +52,7 @@ import static org.awaitility.Awaitility.await;
@ExtendWith({MockitoExtension.class})
class KubernetesServiceDiscoveryTest {
private static final String SERVICE_NAME = "TestService";
private static final String POD_NAME = "TestServer";