Merge pull request #15 from xianyanglin/hango-master

Add Ingress Manager
hango-io · Jul 28, 2023 · 9bd9e5d · 9bd9e5d
2 parents fd27a39 + 8b6550c
commit 9bd9e5d
Show file tree

Hide file tree

Showing 182 changed files with 2,523 additions and 5,560 deletions.
diff --git a/hango-api-plane-server/pom.xml b/hango-api-plane-server/pom.xml
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-model-gatewayapi</artifactId>
-            <version>6.2.0</version>
+            <version>6.6.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.fabric8</groupId>

diff --git a/...ane-server/src/main/java/org/hango/cloud/configuration/ApiPlaneAutoBaseConfiguration.java b/...ane-server/src/main/java/org/hango/cloud/configuration/ApiPlaneAutoBaseConfiguration.java
@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import com.google.common.collect.ImmutableList;
 import com.hubspot.jackson.datatype.protobuf.ProtobufModule;
-import org.hango.cloud.configuration.ext.MeshConfig;
 import org.hango.cloud.util.freemarker.AutoRemoveDirective;
 import org.hango.cloud.util.freemarker.IgnoreDirective;
 import org.hango.cloud.util.freemarker.IndentationDirective;
@@ -21,7 +20,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.http.client.BufferingClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.InterceptingClientHttpRequestFactory;
@@ -36,7 +34,6 @@
 
 
 @Configuration
-@PropertySource(value = {"classpath:mesh-config.properties"})
 public class ApiPlaneAutoBaseConfiguration {
 
     @Autowired
@@ -99,9 +96,4 @@ void configureFreemarkerConfig() throws IOException {
         freemarkerConfig.setSharedVariable("supply", new SupplyDirective());
         freemarkerConfig.setSharedVariable("autoremove", new AutoRemoveDirective());
     }
-
-    @Bean
-    MeshConfig meshConfig() {
-        return new MeshConfig();
-    }
 }
diff --git a/hango-api-plane-server/src/main/java/org/hango/cloud/configuration/ext/MeshConfig.java b/hango-api-plane-server/src/main/java/org/hango/cloud/configuration/ext/MeshConfig.java
diff --git a/hango-api-plane-server/src/main/java/org/hango/cloud/core/AbstractConfigManagerSupport.java b/hango-api-plane-server/src/main/java/org/hango/cloud/core/AbstractConfigManagerSupport.java
@@ -30,8 +30,6 @@ protected void update(ConfigStore configStore, List<K8sResourcePack> resources,
                 if (latest instanceof EmptyResource && pack.hasSubtracter()) {
                     // 若latest标识为emptyResource, 则进行subtract操作
                     merged = pack.getSubtracter().subtract(old);
-                } else if (pack.hasMerger()) {
-                    merged = pack.getMerger().merge(old, latest);
                 } else {
                     merged = modelEngine.merge(old, latest);
                 }

diff --git a/hango-api-plane-server/src/main/java/org/hango/cloud/core/ConfigStore.java b/hango-api-plane-server/src/main/java/org/hango/cloud/core/ConfigStore.java
@@ -21,6 +21,8 @@ public interface ConfigStore {
 
     List<HasMetadata> get(String kind, String namespace);
 
+    List<HasMetadata> get(String kind);
+
     List<HasMetadata> get(String kind, String namespace, Map<String, String> labels);
 
 }
diff --git a/hango-api-plane-server/src/main/java/org/hango/cloud/core/GlobalConfig.java b/hango-api-plane-server/src/main/java/org/hango/cloud/core/GlobalConfig.java
@@ -4,16 +4,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.Arrays;
-import java.util.List;
-
-import static org.hango.cloud.util.Const.VAILD_REGISTRY;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import static org.hango.cloud.util.Const.VAILD_REGISTRY;
 
@@ -29,7 +20,7 @@ public class GlobalConfig {
     @Value("${apiPlaneVersion}")
     private String apiPlaneVersion;
 
-    @Value("${istioRev:gw-1.12}")
+    @Value("${istioRev:gw-stable}")
     private String istioRev;
 
     @Value("${telnet.connect.timeout:3000}")
@@ -41,6 +32,23 @@ public class GlobalConfig {
     @Value("${registry:all}")
     private String registry;
 
+    //项目隔离标识
+    @Value("${projectCode:skiff.netease.com/project}")
+    private String projectCode;
+
+    //ingress controller标识，和istio保持一致
+    @Value("${ingressClass:hango}")
+    private String ingressClass;
+
+    //自定义插件代码挂载cm 名称
+    @Value("${pluginContentConfigName:hango-rider-plugin}")
+    private String pluginContentConfigName;
+
+    //自定义插件schema挂载cm 名称
+    @Value("${pluginSchemaConfigName:hango-plugin-schema}")
+    private String pluginSchemaConfigName;
+
+
     private final String ALL = "all";
 
     @Value("${ignorePlugins:#{null}}")
@@ -85,4 +93,21 @@ public List<String> getRegistryList() {
         }
         return Arrays.asList(registry.split(","));
     }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public String getIngressClass() {
+        return ingressClass;
+    }
+
+    public String getPluginContentConfigName() {
+        return pluginContentConfigName;
+    }
+
+    public String getPluginSchemaConfigName() {
+        return pluginSchemaConfigName;
+    }
+
 }
diff --git a/hango-api-plane-server/src/main/java/org/hango/cloud/core/IstioModelEngine.java b/hango-api-plane-server/src/main/java/org/hango/cloud/core/IstioModelEngine.java
@@ -1,15 +1,14 @@
 package org.hango.cloud.core;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import org.hango.cloud.core.editor.ResourceType;
 import org.hango.cloud.core.k8s.K8sResourceEnum;
 import org.hango.cloud.core.k8s.K8sResourceGenerator;
 import org.hango.cloud.core.k8s.K8sResourcePack;
 import org.hango.cloud.core.k8s.operator.IntegratedResourceOperator;
 import org.hango.cloud.util.exception.ApiPlaneException;
 import org.hango.cloud.util.exception.ExceptionConst;
-import org.hango.cloud.util.function.Merger;
 import org.hango.cloud.util.function.Subtracter;
-import io.fabric8.kubernetes.api.model.HasMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,34 +68,24 @@ protected HasMetadata str2HasMetadata(String str) {
     }
 
     protected List<K8sResourcePack> generateK8sPack(List<String> raws) {
-        return generateK8sPack(raws, null, null, r -> r, this::str2HasMetadata, hsm -> hsm);
+        return generateK8sPack(raws, null, r -> r, this::str2HasMetadata, hsm -> hsm);
     }
 
-    protected List<K8sResourcePack> generateK8sPack(List<String> raws, Function<String, HasMetadata> transFun) {
-        return generateK8sPack(raws, null, null, r -> r, transFun, hsm -> hsm);
-    }
 
     protected List<K8sResourcePack> generateK8sPack(List<String> raws, Subtracter subtracter) {
-        return generateK8sPack(raws, null, subtracter, r -> r, this::str2HasMetadata, hsm -> hsm);
+        return generateK8sPack(raws, subtracter, r -> r, this::str2HasMetadata, hsm -> hsm);
     }
 
-    protected List<K8sResourcePack> generateK8sPack(List<String> raws, Merger merger, Subtracter subtracter, Function<String, HasMetadata> transFun) {
-        return generateK8sPack(raws, merger, subtracter, r -> r, transFun, hsm -> hsm);
-    }
-
-    protected List<K8sResourcePack> generateK8sPack(List<String> raws, Merger merger, Subtracter subtracter, Function<String, String> preFun, Function<String, HasMetadata> transFun) {
-        return generateK8sPack(raws, merger, subtracter, preFun, transFun, hsm -> hsm);
+    protected List<K8sResourcePack> generateK8sPack(List<String> raws, Subtracter subtracter, Function<String, HasMetadata> transFun) {
+        return generateK8sPack(raws, subtracter, r -> r, transFun, hsm -> hsm);
     }
 
     protected List<K8sResourcePack> generateK8sPack(List<String> raws, Subtracter subtracter, Function<String, String> preFun, Function<HasMetadata, HasMetadata> postFun) {
-        return generateK8sPack(raws, null, subtracter, preFun, this::str2HasMetadata, postFun);
+        return generateK8sPack(raws, subtracter, preFun, this::str2HasMetadata, postFun);
     }
 
-    protected List<K8sResourcePack> generateK8sPack(List<String> raws, Function<String, String> preFun, Function<HasMetadata, HasMetadata> postFun) {
-        return generateK8sPack(raws, null, null, preFun, this::str2HasMetadata, postFun);
-    }
 
-    protected List<K8sResourcePack> generateK8sPack(List<String> raws, Merger merger, Subtracter subtracter,
+    protected List<K8sResourcePack> generateK8sPack(List<String> raws, Subtracter subtracter,
                                                   Function<String, String> preFun, Function<String, HasMetadata> transFun,
                                                   Function<HasMetadata, HasMetadata> postFun) {
         if (CollectionUtils.isEmpty(raws)) {
@@ -106,7 +95,7 @@ protected List<K8sResourcePack> generateK8sPack(List<String> raws, Merger merger
         return raws.stream().map(r -> preFun.apply(r))
                 .map(r -> transFun.apply(r))
                 .map(hsm -> postFun.apply(hsm))
-                .map(hsm -> new K8sResourcePack(hsm, merger, subtracter))
+                .map(hsm -> new K8sResourcePack(hsm, subtracter))
                 .collect(Collectors.toList());
     }
 

diff --git a/hango-api-plane-server/src/main/java/org/hango/cloud/core/editor/ResourceGenerator.java b/hango-api-plane-server/src/main/java/org/hango/cloud/core/editor/ResourceGenerator.java
@@ -8,7 +8,6 @@
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Predicate;
 import org.hango.cloud.util.exception.ApiPlaneException;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.util.List;
@@ -274,9 +273,6 @@ public static String yaml2json(String yaml) {
         return yaml2json(yaml, defaultContext);
     }
 
-    public static String json2yaml(String json) {
-        return json2yaml(json, defaultContext);
-    }
 
     public static String obj2json(Object obj) {
         return obj2json(obj, defaultContext);
@@ -286,15 +282,6 @@ public static <T> T json2obj(String json, Class<T> type) {
         return json2obj(json, type, defaultContext);
     }
 
-    public static <T> T yaml2obj(String yaml, Class<T> type) {
-        return yaml2obj(yaml, type, defaultContext);
-    }
-
-    public static String prettyJson(String json) {
-        if (StringUtils.isEmpty(json)) return json;
-        return prettyJson(json, defaultContext);
-    }
-
     public static String yaml2json(String yaml, EditorContext editorContext) {
         try {
             Object obj = editorContext.yamlMapper().readValue(yaml, Object.class);
@@ -329,16 +316,4 @@ public static <T> T json2obj(String json, Class<T> type, EditorContext editorCon
             throw new ApiPlaneException(e.getMessage(), e);
         }
     }
-
-    public static <T> T yaml2obj(String yaml, Class<T> type, EditorContext editorContext) {
-        return json2obj(yaml2json(yaml, editorContext), type, editorContext);
-    }
-
-    public static String prettyJson(String json, EditorContext editorContext) {
-        try {
-            return editorContext.jsonMapper().writerWithDefaultPrettyPrinter().writeValueAsString(json2obj(json, Object.class, editorContext));
-        } catch (JsonProcessingException e) {
-            throw new ApiPlaneException(e.getMessage(), e);
-        }
-    }
 }