Fix: remove ingress trait parameter ingressClassName, use k8s default…

… class (#110) Signed-off-by: xingcan-ltc <[email protected]>
linktimecloud · May 31, 2024 · 83a893e · 83a893e
1 parent c64da64
commit 83a893e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/catalog/flink/x-definitions/app-streampark.cue b/catalog/flink/x-definitions/app-streampark.cue
@@ -236,7 +236,6 @@ template: {
 						},
 						{
 							properties: {
-								ingressClassName: parameter.ingressClassName
 								stickySession:    true
 								service: {
 									ports: [
@@ -370,10 +369,6 @@ template: {
 			}
 		}
 
-		// +ui:description=配置访问 Ingress 地址的 IngressClass, 如果您不清楚IngressClass，请勿随意更改
-		// +ui:order=4
-		ingressClassName: *"kong" | string
-
 		// +ui:description=镜像版本
 		// +ui:options={"disabled": true}
 		// +ui:order=5

diff --git a/catalog/hue/x-definitions/app-hue.cue b/catalog/hue/x-definitions/app-hue.cue
@@ -275,7 +275,6 @@ template: {
 
 						{
 							properties: {
-								ingressClassName: parameter.ingressClassName
 								stickySession:    true
 								service: {
 									ports: [
@@ -444,10 +443,6 @@ template: {
 			}
 		}
 
-		// +ui:description=配置访问 Ingress 地址的 IngressClass, 如果您不清楚IngressClass，请勿随意更改
-		// +ui:order=4
-		ingressClassName: *"kong" | string
-
 		// +ui:description=容器镜像
 		// +ui:options={"disabled": true}
 		// +ui:order=5

diff --git a/infra/kdp-core/definitions/trait-bdos-ingress.cue b/infra/kdp-core/definitions/trait-bdos-ingress.cue
@@ -13,6 +13,8 @@ import "strings"
 template: {
 	import ("strings")
 
+	// could be "kong" or "nginx" ...
+	_ingressClassName: ""
 	// declare _ingressName
 	_ingressName: string
 	if parameter.ingressName != _|_ {
@@ -77,7 +79,9 @@ template: {
 			}
 
 			spec: {
-				ingressClassName: parameter.ingressClassName
+				if _ingressClassName != _|_ && _ingressClassName != "" {
+					ingressClassName: _ingressClassName
+				}
 				rules: [
 					for v in parameter.rules {
 						_rule_domain: *v.host | string
@@ -138,11 +142,13 @@ template: {
 					"\(k)": v
 				}
 			}
+
 			// KongIngress CR
-			if parameter.stickySession && parameter.ingressClassName == "kong"{
+			if parameter.stickySession && _ingressClassName == "kong"
+			// nginxIngress CR
+			{
 				"konghq.com/override": context.name + "-sticky-session"
 			}
-			// nginxIngress CR
 		}
 		metalabels: {
 			"app": context.name
@@ -169,10 +175,11 @@ template: {
 
 	}
 
-
 	outputs: {
 		// KongIngress CR
-		if parameter.stickySession && parameter.ingressClassName == "kong"{
+		if parameter.stickySession && _ingressClassName == "kong"
+		// nginxIngress CR
+		{
 			"kongIngress": {
 				apiVersion: "configuration.konghq.com/v1"
 				kind:       "KongIngress"
@@ -189,16 +196,14 @@ template: {
 				}
 			}
 		}
-		// nginxIngress CR
 	}
 
 	parameter: {
 		namespace?:   *"default" | string
 		ingressName?: string
 		gateway?: [string]:     string
 		annotations?: [string]: string
-		ingressClassName: *"kong" | string
-		stickySession:    *false | bool
+		stickySession: *false | bool
 		service?: {
 			serviceName?: string
 			annotations?: [string]: string

diff --git a/infra/kong/template.cue b/infra/kong/template.cue
@@ -59,7 +59,9 @@ _kong: {
 					repository: "\(parameter.registry)/kong/kubernetes-ingress-controller"
 					tag: "2.12"
 				ingressClass: "kong"
-				ingressClassAnnotations: {}
+				ingressClassAnnotations: {
+					"ingressclass.kubernetes.io/is-default-class": "true"
+				}
 			}
 			waitImage: {
 				enabled: true