diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/KubernetesRegistryConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/KubernetesRegistryConfiguration.java new file mode 100644 index 000000000..8226cb3ac --- /dev/null +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/KubernetesRegistryConfiguration.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alipay.sofa.boot.autoconfigure.rpc; + +import com.alipay.sofa.boot.autoconfigure.condition.ConditionalOnSwitch; +import com.alipay.sofa.rpc.boot.config.KubernetesConfigurator; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@ConditionalOnSwitch(value = "rpcKubernetesRegistry") +public class KubernetesRegistryConfiguration { + + @Bean + @ConditionalOnMissingBean + public KubernetesConfigurator kubernetesConfigurator() { + return new KubernetesConfigurator(); + } +} diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/RegistryConfigurations.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/RegistryConfigurations.java index ec6e6570d..316f3f6ef 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/RegistryConfigurations.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/RegistryConfigurations.java @@ -31,6 +31,7 @@ public static String[] registryConfigurationClass() { MeshRegistryConfiguration.class.getName(), ConsulRegistryConfiguration.class.getName(), SofaRegistryConfiguration.class.getName(), - PolarisRegistryConfiguration.class.getName() }; + PolarisRegistryConfiguration.class.getName(), + KubernetesRegistryConfiguration.class.getName() }; } } diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/config/KubernetesConfigurator.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/config/KubernetesConfigurator.java new file mode 100644 index 000000000..fb70abead --- /dev/null +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/config/KubernetesConfigurator.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alipay.sofa.rpc.boot.config; + +import com.alipay.sofa.rpc.boot.common.RegistryParseUtil; +import com.alipay.sofa.rpc.config.RegistryConfig; + +import java.util.Map; + +/** + * Kubernetes配置 + *

+ * com.alipay.sofa.rpc.registry.address=kubernetes://kubernetes.default.svc:8848?k1=v1 + */ +public class KubernetesConfigurator implements RegistryConfigureProcessor { + + public KubernetesConfigurator() { + } + + @Override + public RegistryConfig buildFromAddress(String address) { + String kubernetesAddress = RegistryParseUtil.parseAddress(address, + SofaBootRpcConfigConstants.REGISTRY_PROTOCOL_KUBERNETES); + Map map = RegistryParseUtil.parseParam(address, + SofaBootRpcConfigConstants.REGISTRY_PROTOCOL_KUBERNETES); + + return new RegistryConfig().setAddress(kubernetesAddress).setParameters(map) + .setProtocol(SofaBootRpcConfigConstants.REGISTRY_PROTOCOL_KUBERNETES); + } + + @Override + public String registryType() { + return SofaBootRpcConfigConstants.REGISTRY_PROTOCOL_KUBERNETES; + } + +} diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/config/SofaBootRpcConfigConstants.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/config/SofaBootRpcConfigConstants.java index bc6b66849..477fc4eeb 100644 --- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/config/SofaBootRpcConfigConstants.java +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/config/SofaBootRpcConfigConstants.java @@ -71,6 +71,8 @@ public class SofaBootRpcConfigConstants { public static final String REGISTRY_PROTOCOL_POLARIS = "polaris"; + public static final String REGISTRY_PROTOCOL_KUBERNETES = "kubernetes"; + /* server */ public static final String RPC_PROTOCOL_BOLT = "bolt"; public static final String RPC_PROTOCOL_REST = "rest"; diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/config/KubernetesConfiguratorTest.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/config/KubernetesConfiguratorTest.java new file mode 100644 index 000000000..effd9c321 --- /dev/null +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/config/KubernetesConfiguratorTest.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alipay.sofa.rpc.boot.test.config; + +import com.alipay.sofa.rpc.boot.config.KubernetesConfigurator; +import com.alipay.sofa.rpc.config.RegistryConfig; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class KubernetesConfiguratorTest { + + @Test + public void buildFromAddress() { + String address = "kubernetes://kubernetes.default.svc:20881?cluster=test"; + + KubernetesConfigurator kubernetesConfigurator = new KubernetesConfigurator(); + RegistryConfig registryConfig = kubernetesConfigurator.buildFromAddress(address); + + assertThat(registryConfig).isNotNull(); + assertThat("kubernetes").isEqualTo(registryConfig.getProtocol()); + assertThat("kubernetes.default.svc:20881").isEqualTo(registryConfig.getAddress()); + assertThat(registryConfig.getParameters()).isNotNull(); + assertThat("test").isEqualTo(registryConfig.getParameter("cluster")); + } +} \ No newline at end of file