feat: 新增多个Ingress控制器类型

Author: LidolLxf

bcs-services/cluster-resources/pkg/resource/constants/network.go

@@ -27,6 +27,9 @@ const (
 
 	// IngSubNetIDAnnoKey ...
 	IngSubNetIDAnnoKey = "kubernetes.io/ingress.subnetId"
+
+	// AwsIngSubNetIDAnnoKey ...
+	AwsIngSubNetIDAnnoKey = "alb.ingress.kubernetes.io/subnets"
 )
 
 const (

bcs-services/cluster-resources/pkg/resource/form/parser/network/ing.go

@@ -76,6 +76,10 @@ func ParseIngNetwork(manifest map[string]interface{}, network *model.IngNetwork)
 
 	subNetIDPath := []string{"metadata", "annotations", resCsts.IngSubNetIDAnnoKey}
 	network.SubNetID = mapx.GetStr(manifest, subNetIDPath)
+	// 新增aws ingress 子网id解析
+	if network.SubNetID == "" {
+		network.SubNetID = mapx.GetStr(manifest, []string{"metadata", "annotations", resCsts.AwsIngSubNetIDAnnoKey})
+	}
 
 	// 如果已指定子网 ID，则使用模式为为自动创建新 clb，否则使用已存在的 clb
 	if network.SubNetID != "" {

bcs-services/cluster-resources/pkg/resource/form/tmpl/manifest/Ingress.yaml

@@ -9,7 +9,13 @@ metadata:
   {{- end }}
   annotations:
     {{- range .metadata.annotations }}
-    {{- if and (ne .key "kubernetes.io/ingress.class") (ne .key "kubernetes.io/ingress.existLbId") (ne .key "ingress.cloud.tencent.com/pass-to-target") (ne .key "kubernetes.io/ingress.subnetId") (ne .key "ingress.cloud.tencent.com/auto-rewrite") }}
+    {{- if and 
+        (ne .key "kubernetes.io/ingress.class") 
+        (ne .key "kubernetes.io/ingress.existLbId") 
+        (ne .key "ingress.cloud.tencent.com/pass-to-target") 
+        (ne .key "kubernetes.io/ingress.subnetId") 
+        (ne .key "alb.ingress.kubernetes.io/subnets") 
+        (ne .key "ingress.cloud.tencent.com/auto-rewrite") }}
     {{ .key | quote }}: {{ .value | default "" | quote }}
     {{- end }}
     {{- end }}
@@ -28,6 +34,12 @@ metadata:
     {{- end }}
     ingress.cloud.tencent.com/pass-to-target: "true"
     {{- end }}
+    # 处理 aws 特有的一些 annotations
+    {{- if eq .controller.type "alb" }}
+    {{- if ne .spec.network.subNetID "" }}
+    alb.ingress.kubernetes.io/subnets: {{ .spec.network.subNetID | quote }}
+    {{- end }}
+    {{- end }}
   {{- if .metadata.resVersion }}
   resourceVersion: {{ .metadata.resVersion | quote }}
   {{- end }}

bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/Ingress.yaml

@@ -19,18 +19,30 @@ properties:
                 value: qcloud
                 disabled: false
                 tips: ""
+              - label: alb
+                value: alb
+                disabled: false
+                tips: "" 
+              - label: gce
+                value: gce
+                disabled: false
+                tips: "" 
+              - label: azure/application-gateway
+                value: azure/application-gateway
+                disabled: false
+                tips: ""
               - label: nginx
                 value: nginx
-                disabled: true
-                tips: {{ i18n "暂时不支持该控制器" .lang }}
+                disabled: false
+                tips: ""
               - label: bcs
                 value: bcs
                 disabled: true
                 tips: {{ i18n "暂时不支持该控制器" .lang }}
         ui:reactions:
-          # qcloud 暂时不支持 defaultBackend
+          # qcloud、alb 暂时不支持 defaultBackend
           - target: spec.defaultBackend.targetSVC
-            if: "{{`{{`}} $self.value === 'qcloud' {{`}}`}}"
+            if: "{{`{{`}} $self.value === 'qcloud' || $self.value === 'alb' {{`}}`}}"
             then:
               state:
                 value: ""
@@ -39,14 +51,32 @@ properties:
               state:
                 disabled: false
           - target: spec.defaultBackend.port
-            if: "{{`{{`}} $self.value === 'qcloud' {{`}}`}}"
+            if: "{{`{{`}} $self.value === 'qcloud' || $self.value === 'alb' {{`}}`}}"
             then:
               state:
                 value: 0
                 disabled: true
             else:
               state:
                 disabled: false
+          - target: spec.network.clbUseType
+            if: "{{`{{`}} $self.value === 'alb' {{`}}`}}"
+            then:
+              state:
+                value: "autoCreate"
+                visible: false
+            else:
+              state:
+                visible: true
+          - target: spec.network
+            if: "{{`{{`}} $self.value === 'gce' || $self.value === 'azure/application-gateway' || $self.value === 'nginx' {{`}}`}}"
+            then:
+              state:
+                value: ""
+                visible: false    
+            else:
+              state:
+                visible: true          
           # 目前只支持 qcloud 的重定向，nginx 后续支持了再开放
           - target: spec.cert.autoRewriteHttp
             if: "{{`{{`}} $self.value === 'qcloud' {{`}}`}}"

bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/network.tpl

@@ -184,7 +184,7 @@ defaultBackend:
     targetSVC:
       title: {{ i18n "目标 Service" .lang }}
       type: string
-      description: {{ i18n "控制器类型 qcloud 暂时不支持配置默认后端" .lang }}
+      description: {{ i18n "控制器类型 qcloud、alb 暂时不支持配置默认后端" .lang }}
       default: ""
       ui:component:
         name: select
@@ -212,7 +212,7 @@ defaultBackend:
     port:
       title: {{ i18n "端口" .lang }}
       type: integer
-      description: {{ i18n "控制器类型 qcloud 暂时不支持配置默认后端" .lang }}
+      description: {{ i18n "控制器类型 qcloud、alb 暂时不支持配置默认后端" .lang }}
       ui:component:
         props:
           min: 1