Merge branch 'master' into support_io_uring

all/pom.xml

@@ -244,6 +244,11 @@
             <artifactId>sofa-rpc-registry-polaris</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>sofa-rpc-registry-kubernetes</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-remoting-bolt</artifactId>
@@ -545,6 +550,7 @@
                                     <include>com.alipay.sofa:sofa-rpc-registry-multicast</include>
                                     <include>com.alipay.sofa:sofa-rpc-registry-sofa</include>
                                     <include>com.alipay.sofa:sofa-rpc-registry-polaris</include>
+                                    <include>com.alipay.sofa:sofa-rpc-registry-kubernetes</include>
                                     <include>com.alipay.sofa:sofa-rpc-remoting-bolt</include>
                                     <include>com.alipay.sofa:sofa-rpc-remoting-http</include>
                                     <include>com.alipay.sofa:sofa-rpc-remoting-resteasy</include>

bom/pom.xml

@@ -60,7 +60,8 @@
         <!-- Build args -->
         <module.install.skip>true</module.install.skip>
         <module.deploy.skip>true</module.deploy.skip>
-
+        <!-- Fabric8 for Kubernetes -->
+        <fabric8_kubernetes_version>6.9.2</fabric8_kubernetes_version>
         <!-- io_uring -->
         <netty-iouring.version>0.0.21.Final</netty-iouring.version>
     </properties>
@@ -517,6 +518,19 @@
                 <version>${grpc.version}</version>
             </dependency>
 
+            <!-- Fabric8 for Kubernetes -->
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>kubernetes-client</artifactId>
+                <version>${fabric8_kubernetes_version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>kubernetes-server-mock</artifactId>
+                <scope>test</scope>
+                <version>${fabric8_kubernetes_version}</version>
+            </dependency>
+
             <!-- Test libs -->
             <dependency>
                 <groupId>org.apache.curator</groupId>

bootstrap/bootstrap-api/src/main/java/com/alipay/sofa/rpc/bootstrap/DefaultClientProxyInvoker.java

@@ -133,6 +133,7 @@ protected void decorateRequest(SofaRequest request) {
         // 额外属性通过HEAD传递给服务端
         request.addRequestProp(RemotingConstants.HEAD_APP_NAME, consumerConfig.getAppName());
         request.addRequestProp(RemotingConstants.HEAD_PROTOCOL, consumerConfig.getProtocol());
+        request.addRequestProp(RemotingConstants.HEAD_INVOKE_TYPE, request.getInvokeType());
 
         customRequest(request, internalContext);
 

core/api/src/main/java/com/alipay/sofa/rpc/config/RegistryConfig.java

@@ -398,6 +398,36 @@ public String getParameter(String key) {
         return parameters == null ? null : parameters.get(key);
     }
 
+    /**
+     * Gets parameter or default.
+     *
+     * @param key the key
+     * @return the value
+     */
+    public String getParameter(String key, String defaultValue) {
+        return getParameter(key) == null ? defaultValue : getParameter(key);
+    }
+
+    /**
+     * Gets parameter or default.
+     *
+     * @param key the key
+     * @return the value
+     */
+    public int getParameter(String key, int defaultValue) {
+        return getParameter(key) == null ? defaultValue : Integer.parseInt(parameters.get(key));
+    }
+
+    /**
+     * Gets parameter or default.
+     *
+     * @param key the key
+     * @return the value
+     */
+    public boolean getParameter(String key, boolean defaultValue) {
+        return getParameter(key) == null ? defaultValue : Boolean.parseBoolean(parameters.get(key));
+    }
+
     @Override
     public String toString() {
         return "RegistryConfig{" +

registry/pom.xml

@@ -22,6 +22,7 @@
         <module>registry-multicast</module>
         <module>registry-sofa</module>
         <module>registry-polaris</module>
+        <module>registry-kubernetes</module>
     </modules>
 
     <dependencyManagement>

registry/registry-kubernetes/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.alipay.sofa</groupId>
+        <artifactId>sofa-rpc-registry</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>sofa-rpc-registry-kubernetes</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>sofa-rpc-log</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>sofa-rpc-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>sofa-rpc-codec-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-server-mock</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>