moremind commented on code in PR #5054: URL: https://github.com/apache/shenyu/pull/5054#discussion_r1300820040
########## shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/parser/MotanIngressParser.java: ########## @@ -0,0 +1,288 @@ +/* + * 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 org.apache.shenyu.k8s.parser; + +import io.kubernetes.client.informer.cache.Lister; +import io.kubernetes.client.openapi.ApiException; +import io.kubernetes.client.openapi.apis.CoreV1Api; +import io.kubernetes.client.openapi.models.V1Endpoints; +import io.kubernetes.client.openapi.models.V1HTTPIngressPath; +import io.kubernetes.client.openapi.models.V1Ingress; +import io.kubernetes.client.openapi.models.V1IngressBackend; +import io.kubernetes.client.openapi.models.V1IngressRule; +import io.kubernetes.client.openapi.models.V1IngressTLS; +import io.kubernetes.client.openapi.models.V1Secret; +import io.kubernetes.client.openapi.models.V1Service; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.shenyu.common.config.ssl.SslCrtAndKeyStream; +import org.apache.shenyu.common.dto.ConditionData; +import org.apache.shenyu.common.dto.MetaData; +import org.apache.shenyu.common.dto.RuleData; +import org.apache.shenyu.common.dto.SelectorData; +import org.apache.shenyu.common.enums.MatchModeEnum; +import org.apache.shenyu.common.enums.OperatorEnum; +import org.apache.shenyu.common.enums.ParamTypeEnum; +import org.apache.shenyu.common.enums.PluginEnum; +import org.apache.shenyu.common.enums.SelectorTypeEnum; +import org.apache.shenyu.common.exception.ShenyuException; +import org.apache.shenyu.k8s.common.IngressConfiguration; +import org.apache.shenyu.k8s.common.IngressConstants; +import org.apache.shenyu.k8s.common.ShenyuMemoryConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +public class MotanIngressParser implements K8sResourceParser<V1Ingress> { + private static final Logger LOG = LoggerFactory.getLogger(MotanIngressParser.class); + + private final Lister<V1Service> serviceLister; + + private final Lister<V1Endpoints> endpointsLister; + + /** + * IngressParser Constructor. + * + * @param serviceLister serviceLister + * @param endpointsLister endpointsLister + */ + public MotanIngressParser(final Lister<V1Service> serviceLister, final Lister<V1Endpoints> endpointsLister) { + this.serviceLister = serviceLister; + this.endpointsLister = endpointsLister; + } + + /** + * Parse ingress to ShenyuMemoryConfig. + * + * @param ingress ingress resource + * @param coreV1Api coreV1Api + * @return ShenyuMemoryConfig + */ + @Override + public ShenyuMemoryConfig parse(final V1Ingress ingress, final CoreV1Api coreV1Api) { + ShenyuMemoryConfig res = new ShenyuMemoryConfig(); + + if (Objects.nonNull(ingress.getSpec())) { + // Parse the default backend + V1IngressBackend defaultBackend = ingress.getSpec().getDefaultBackend(); + List<V1IngressRule> rules = ingress.getSpec().getRules(); + List<V1IngressTLS> tlsList = ingress.getSpec().getTls(); + + String namespace = Objects.requireNonNull(ingress.getMetadata()).getNamespace(); + + if (Objects.isNull(rules) || CollectionUtils.isEmpty(rules)) { + // if rules is null, defaultBackend become global default + if (Objects.nonNull(defaultBackend) && Objects.nonNull(defaultBackend.getService())) { + IngressConfiguration defaultRouteConfig = getDefaultRouteConfig(ingress.getMetadata().getAnnotations()); + res.setGlobalDefaultBackend(Pair.of(Pair.of(namespace + "/" + ingress.getMetadata().getName(), defaultBackend.getService().getName()), + defaultRouteConfig)); + } + } else { + // if rules is not null, defaultBackend is default in this ingress + List<IngressConfiguration> routeList = new ArrayList<>(rules.size()); + for (V1IngressRule ingressRule : rules) { + List<IngressConfiguration> routes = parseIngressRule(ingressRule, + Objects.requireNonNull(ingress.getMetadata()).getNamespace(), ingress.getMetadata().getAnnotations()); + routeList.addAll(routes); + } + res.setRouteConfigList(routeList); + } + + // Parse tls + if (Objects.nonNull(tlsList) && CollectionUtils.isNotEmpty(tlsList)) { + List<SslCrtAndKeyStream> sslList = new ArrayList<>(); + for (V1IngressTLS tls : tlsList) { + if (tls.getSecretName() != null && tls.getHosts() != null && CollectionUtils.isNotEmpty(tls.getHosts())) { + try { + V1Secret secret = coreV1Api.readNamespacedSecret(tls.getSecretName(), namespace, "ture"); + if (Objects.nonNull(secret.getData())) { + InputStream keyCertChainInputStream = new ByteArrayInputStream(secret.getData().get("tls.crt")); + InputStream keyInputStream = new ByteArrayInputStream(secret.getData().get("tls.key")); + tls.getHosts().forEach(host -> + sslList.add(new SslCrtAndKeyStream(host, keyCertChainInputStream, keyInputStream)) + ); + } + } catch (ApiException e) { + LOG.error("parse tls failed ", e); + } + } + } + res.setTlsConfigList(sslList); + } + } + return res; + } + + private List<IngressConfiguration> parseIngressRule(final V1IngressRule ingressRule, + final String namespace, + final Map<String, String> annotations) { + List<IngressConfiguration> res = new ArrayList<>(); + + ConditionData hostCondition = null; + if (Objects.nonNull(ingressRule.getHost())) { + hostCondition = new ConditionData(); + hostCondition.setParamType(ParamTypeEnum.URI.getName()); + hostCondition.setOperator(OperatorEnum.EQ.getAlias()); + hostCondition.setParamValue(ingressRule.getHost()); + } + if (Objects.nonNull(ingressRule.getHttp())) { + List<V1HTTPIngressPath> paths = ingressRule.getHttp().getPaths(); + if (paths != null) { Review Comment: use Objects.nonNull() ########## shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/parser/DubboIngressParser.java: ########## @@ -292,7 +292,7 @@ private List<DubboUpstream> parseUpstream(final V1IngressBackend backend, final DubboUpstream upstream = DubboUpstream.builder() .upstreamUrl(clusterIP + ":" + defaultPort) .weight(100) - .protocol("http://";) + .protocol("dubbo://") Review Comment: can the user config protocol? ########## shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/parser/MotanIngressParser.java: ########## @@ -0,0 +1,288 @@ +/* + * 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 org.apache.shenyu.k8s.parser; + +import io.kubernetes.client.informer.cache.Lister; +import io.kubernetes.client.openapi.ApiException; +import io.kubernetes.client.openapi.apis.CoreV1Api; +import io.kubernetes.client.openapi.models.V1Endpoints; +import io.kubernetes.client.openapi.models.V1HTTPIngressPath; +import io.kubernetes.client.openapi.models.V1Ingress; +import io.kubernetes.client.openapi.models.V1IngressBackend; +import io.kubernetes.client.openapi.models.V1IngressRule; +import io.kubernetes.client.openapi.models.V1IngressTLS; +import io.kubernetes.client.openapi.models.V1Secret; +import io.kubernetes.client.openapi.models.V1Service; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.shenyu.common.config.ssl.SslCrtAndKeyStream; +import org.apache.shenyu.common.dto.ConditionData; +import org.apache.shenyu.common.dto.MetaData; +import org.apache.shenyu.common.dto.RuleData; +import org.apache.shenyu.common.dto.SelectorData; +import org.apache.shenyu.common.enums.MatchModeEnum; +import org.apache.shenyu.common.enums.OperatorEnum; +import org.apache.shenyu.common.enums.ParamTypeEnum; +import org.apache.shenyu.common.enums.PluginEnum; +import org.apache.shenyu.common.enums.SelectorTypeEnum; +import org.apache.shenyu.common.exception.ShenyuException; +import org.apache.shenyu.k8s.common.IngressConfiguration; +import org.apache.shenyu.k8s.common.IngressConstants; +import org.apache.shenyu.k8s.common.ShenyuMemoryConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +public class MotanIngressParser implements K8sResourceParser<V1Ingress> { + private static final Logger LOG = LoggerFactory.getLogger(MotanIngressParser.class); + + private final Lister<V1Service> serviceLister; + + private final Lister<V1Endpoints> endpointsLister; + + /** + * IngressParser Constructor. + * + * @param serviceLister serviceLister + * @param endpointsLister endpointsLister + */ + public MotanIngressParser(final Lister<V1Service> serviceLister, final Lister<V1Endpoints> endpointsLister) { + this.serviceLister = serviceLister; + this.endpointsLister = endpointsLister; + } + + /** + * Parse ingress to ShenyuMemoryConfig. + * + * @param ingress ingress resource + * @param coreV1Api coreV1Api + * @return ShenyuMemoryConfig + */ + @Override + public ShenyuMemoryConfig parse(final V1Ingress ingress, final CoreV1Api coreV1Api) { + ShenyuMemoryConfig res = new ShenyuMemoryConfig(); + + if (Objects.nonNull(ingress.getSpec())) { + // Parse the default backend + V1IngressBackend defaultBackend = ingress.getSpec().getDefaultBackend(); + List<V1IngressRule> rules = ingress.getSpec().getRules(); + List<V1IngressTLS> tlsList = ingress.getSpec().getTls(); + + String namespace = Objects.requireNonNull(ingress.getMetadata()).getNamespace(); + + if (Objects.isNull(rules) || CollectionUtils.isEmpty(rules)) { + // if rules is null, defaultBackend become global default + if (Objects.nonNull(defaultBackend) && Objects.nonNull(defaultBackend.getService())) { + IngressConfiguration defaultRouteConfig = getDefaultRouteConfig(ingress.getMetadata().getAnnotations()); + res.setGlobalDefaultBackend(Pair.of(Pair.of(namespace + "/" + ingress.getMetadata().getName(), defaultBackend.getService().getName()), + defaultRouteConfig)); + } + } else { + // if rules is not null, defaultBackend is default in this ingress + List<IngressConfiguration> routeList = new ArrayList<>(rules.size()); + for (V1IngressRule ingressRule : rules) { + List<IngressConfiguration> routes = parseIngressRule(ingressRule, + Objects.requireNonNull(ingress.getMetadata()).getNamespace(), ingress.getMetadata().getAnnotations()); + routeList.addAll(routes); + } + res.setRouteConfigList(routeList); + } + + // Parse tls + if (Objects.nonNull(tlsList) && CollectionUtils.isNotEmpty(tlsList)) { + List<SslCrtAndKeyStream> sslList = new ArrayList<>(); + for (V1IngressTLS tls : tlsList) { + if (tls.getSecretName() != null && tls.getHosts() != null && CollectionUtils.isNotEmpty(tls.getHosts())) { + try { + V1Secret secret = coreV1Api.readNamespacedSecret(tls.getSecretName(), namespace, "ture"); + if (Objects.nonNull(secret.getData())) { + InputStream keyCertChainInputStream = new ByteArrayInputStream(secret.getData().get("tls.crt")); + InputStream keyInputStream = new ByteArrayInputStream(secret.getData().get("tls.key")); + tls.getHosts().forEach(host -> + sslList.add(new SslCrtAndKeyStream(host, keyCertChainInputStream, keyInputStream)) + ); + } + } catch (ApiException e) { + LOG.error("parse tls failed ", e); + } + } + } + res.setTlsConfigList(sslList); + } + } + return res; + } + + private List<IngressConfiguration> parseIngressRule(final V1IngressRule ingressRule, + final String namespace, + final Map<String, String> annotations) { + List<IngressConfiguration> res = new ArrayList<>(); + + ConditionData hostCondition = null; + if (Objects.nonNull(ingressRule.getHost())) { + hostCondition = new ConditionData(); + hostCondition.setParamType(ParamTypeEnum.URI.getName()); + hostCondition.setOperator(OperatorEnum.EQ.getAlias()); + hostCondition.setParamValue(ingressRule.getHost()); + } + if (Objects.nonNull(ingressRule.getHttp())) { + List<V1HTTPIngressPath> paths = ingressRule.getHttp().getPaths(); + if (paths != null) { + for (V1HTTPIngressPath path : paths) { + if (path.getPath() == null) { + continue; + } + + OperatorEnum operator; + if ("ImplementationSpecific".equals(path.getPathType())) { + operator = OperatorEnum.MATCH; + } else if ("Prefix".equals(path.getPathType())) { + operator = OperatorEnum.STARTS_WITH; + } else if ("Exact".equals(path.getPathType())) { + operator = OperatorEnum.EQ; + } else { + LOG.info("Invalid path type, set it with match operator"); + operator = OperatorEnum.MATCH; + } + + ConditionData pathCondition = new ConditionData(); + pathCondition.setOperator(operator.getAlias()); + pathCondition.setParamType(ParamTypeEnum.URI.getName()); + pathCondition.setParamValue(path.getPath()); + List<ConditionData> conditionList = new ArrayList<>(2); + if (Objects.nonNull(hostCondition)) { + conditionList.add(hostCondition); + } + conditionList.add(pathCondition); + ConditionData ruleConditionData = new ConditionData(); + ruleConditionData.setParamType(ParamTypeEnum.URI.getName()); + ruleConditionData.setOperator(OperatorEnum.EQ.getAlias()); + ruleConditionData.setParamName(annotations.getOrDefault(IngressConstants.PLUGIN_MOTAN_PATH, path.getPath())); + List<ConditionData> ruleConditionDataList = new ArrayList<>(); + ruleConditionDataList.add(ruleConditionData); + + SelectorData selectorData = SelectorData.builder() + .pluginId(String.valueOf(PluginEnum.MOTAN.getCode())) + .pluginName(PluginEnum.MOTAN.getName()) + .name(path.getPath()) + .matchMode(MatchModeEnum.AND.getCode()) + .type(SelectorTypeEnum.CUSTOM_FLOW.getCode()) + .enabled(true) + .logged(false) + .continued(true) + .conditionList(conditionList).build(); + + RuleData ruleData = RuleData.builder() Review Comment: can the user config these? ########## shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/reconciler/IngressReconciler.java: ########## @@ -439,4 +433,24 @@ private void addNewIngressConfigToShenyu(final V1Ingress v1Ingress, final CoreV1 } } } + + private String getPluginName(final V1Ingress ingress) { + String pluginName; + String pluginDubboEnabled = ingress.getMetadata().getAnnotations().get(IngressConstants.PLUGIN_DUBBO_ENABLED); + String pluginMotanEnabled = ingress.getMetadata().getAnnotations().get(IngressConstants.PLUGIN_MOTAN_ENABLED); + String pluginSpringCloudEnabled = ingress.getMetadata().getAnnotations().get(IngressConstants.PLUGIN_SPRING_CLOUD_ENABLED); + String pluginWebSocketEnabled = ingress.getMetadata().getAnnotations().get(IngressConstants.PLUGIN_WEB_SOCKET_ENABLED); + if ("true".equals(pluginDubboEnabled)) { Review Comment: Boolean.TRUE -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
