Feat: Add the CI step to check the addon config

.github/workflows/ci.yaml

@@ -33,7 +33,6 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-
     - uses: actions/setup-node@v2
       with:
         node-version: '16'

.github/workflows/server-test.yml

@@ -161,6 +161,7 @@ jobs:
           make e2e-setup-core
           make start-addon-mock-server
           make load-image
+          make enable-addon
 
       - name: Run server e2e test
         run: |

Makefile

@@ -90,6 +90,9 @@ start-addon-mock-server:
 load-image:
 	k3d image import oamdev/velaux:latest || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
+enable-addon:
+	vela addon enable ./addon 
+
 .PHONY: e2e-server-test
 e2e-server-test:
 	go test -v -coverpkg=./... -coverprofile=/tmp/e2e_apiserver_test.out ./e2e-test

addon/NOTES.cue

@@ -3,8 +3,6 @@ info: """
 
 	    vela port-forward -n vela-system addon-velaux 9082:80
 
-	    Select \"local | velaux | velaux\" from the prompt.
-
 	    Please refer to https://kubevela.io/docs/reference/addons/velaux for more VelaUX addon installation and visiting method.
 	"""
 notes: (info)

addon/metadata.yaml

@@ -1,15 +1,16 @@
 name: velaux
-version: v1.7.4
-description: KubeVela User Experience (UX). An extensible, application-oriented delivery and management Dashboard.
+version: latest
+description: KubeVela User Experience (UX). An extensible, application-oriented delivery and management Platform.
 icon: https://static.kubevela.net/images/logos/KubeVela%20-03.png
 url: https://kubevela.io
 
 tags:
   - Official
+  - Dashboard
 
 deployTo:
   controlPlane: true
   runtimeCluster: false
 
 system:
-  vela: ">=v1.6.0-alpha.6"
+  vela: ">=v1.6.0"

addon/parameter.cue

@@ -19,8 +19,6 @@ parameter: {
 	serviceType: *"ClusterIP" | "NodePort" | "LoadBalancer"
 	// +usage=Specify the names of imagePullSecret for private image registry, eg. "{a,b,c}"
 	imagePullSecrets?: [...string]
-	// +usage=Specify whether to enable the dex
-	dex: *false | bool
 	// +usage=Specify the replicas.
 	replicas: *1 | int
 	// +usage=Specify nodeport. This will be ignored if serviceType is not NodePort.

addon/resources/apiserver.cue → addon/resources/server.cue

@@ -14,7 +14,44 @@ enableImpersonation: *[ if parameter["enableImpersonation"] {
 	"--feature-gates=EnableImpersonation=true"
 }] | []
 
-apiserver: {
+_nginxTrait: *[
+		if parameter["domain"] != _|_ && parameter["gatewayDriver"] == "nginx" {
+		{
+			type: "gateway"
+			properties: {
+				domain: parameter["domain"]
+				http: {
+					"/": 8000
+				}
+				class: "nginx"
+			}
+		}
+	},
+] | []
+
+_traefikTrait: *[
+		if parameter["domain"] != _|_ && parameter["gatewayDriver"] == "traefik" {
+		{
+			type: "http-route"
+			properties: {
+				domains: [ parameter["domain"]]
+				rules: [{port: 8000}]
+			}
+		}
+	},
+] | []
+
+_httpsTrait: *[ if parameter["secretName"] != _|_ && parameter["domain"] != _|_ && parameter["gatewayDriver"] == "traefik" {
+	type: "https-route"
+	properties: {
+		domains: [ parameter["domain"]]
+		rules: [{port: 80}]
+		secrets: [{
+			name: parameter["secretName"]
+		}]
+	}}] | []
+
+server: {
 	name: "apiserver"
 	type: "webservice"
 	properties: {
@@ -30,12 +67,19 @@ apiserver: {
 			imagePullSecrets: parameter["imagePullSecrets"]
 		}
 
+		if parameter["serviceType"] != _|_ {
+			exposeType: parameter["serviceType"]
+		}
+
 		cmd: ["apiserver", "--datastore-type=" + parameter["dbType"]] + database + dbURL + enableImpersonation
 		ports: [
 			{
 				port:     8000
 				protocol: "TCP"
 				expose:   true
+				if parameter["serviceType"] == "NodePort" {
+					nodePort: parameter["nodePort"]
+				}
 			},
 		]
 	}
@@ -46,5 +90,5 @@ apiserver: {
 			properties: name: parameter["serviceAccountName"]
 		},
 		{type: "scaler", properties: replicas: parameter["replicas"]},
-	]
+	] + _nginxTrait + _traefikTrait + _httpsTrait
 }

addon/template.cue

@@ -4,6 +4,6 @@ output: {
 	apiVersion: "core.oam.dev/v1beta1"
 	kind:       "Application"
 	spec: {
-		components: [additionalPrivileges, apiserver, velaux]
+		components: [additionalPrivileges, server]
 	}
 }