Skip to content

Commit

Permalink
Support kubernetes registry configuration (#1288)
Browse files Browse the repository at this point in the history
* Support kubernetes registry configuration, related #1395

---------

Co-authored-by: 呈铭 <[email protected]>
  • Loading branch information
wangchengming666 and 呈铭 authored Mar 25, 2024
1 parent 0fbe6e7 commit 29637f3
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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() };
}
}
Original file line number Diff line number Diff line change
@@ -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配置
* <p>
* 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<String, String> 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;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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"));
}
}

0 comments on commit 29637f3

Please sign in to comment.