Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support kubernetes registry configuration #1288

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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"));
}
}
Loading