Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Addon] velaux allow a custom ingress class name #741

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

[Addon] velaux allow a custom ingress class name #741

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dbc6814
velaux ingress expose ingress class name prameter
oanasc Nov 24, 2023
213f077
chartmuseum configuration updates
oanasc Dec 8, 2023
3a27f29
Merge branch 'kubevela:master' into master
oanasc Dec 8, 2023
a63e058
documentation correction
oanasc Jan 3, 2024
04353f1
Merge branch 'kubevela:master' into master
oanasc Jan 3, 2024
436cfd1
Merge branch 'kubevela:master' into master
oanasc Jan 15, 2024
064743c
Merge branch 'master' of github.com:oanasc/catalog into test
oanasc Jan 15, 2024
e7ebde6
use gatewayDriver
oanasc Jan 15, 2024
cc6ae7b
restore uischema
oanasc Jan 15, 2024
f39c13f
Merge branch 'kubevela:master' into test
oanasc Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/velaux/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: velaux
version: v1.9.3
version: v1.9.4
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
Expand Down
2 changes: 2 additions & 0 deletions addons/velaux/parameter.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ parameter: {
secretName?: string
// +usage=Specify the gateway type.
gatewayDriver: *"nginx" | "traefik"
// +usage=Specify the ingress class name if gateway driver is nginx.
ingressClass: *"nginx" | string
// +usage=Specify the serviceAccountName for apiserver
serviceAccountName: *"kubevela-ux" | string
// +usage=Specify the service type.
Expand Down
2 changes: 1 addition & 1 deletion addons/velaux/resources/server.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ _nginxTrait: *[
http: {
"/": 8000
}
class: "nginx"
class: parameter["ingressClass"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you can reuse the gatewayDriver field.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted, updated to use gatewayDriver and works on my cluser. The e2e test however is timing out, seeing why

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are failing because the version of the addon is also used for the image tag, do you prefer creating a new tag v1.9.4 or parameterising the image tag and allow for addons upgrades independently from velaux

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@charlie0129 what do you think. I get is nice for the tag/version of addon to map but in reality there can be addon changes with not image release

}
}
},
Expand Down
4 changes: 3 additions & 1 deletion addons/velaux/schemas/addon-uischema-velaux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
- jsonKey: repo
sort: 11
- jsonKey: imagePullSecrets
sort: 13
sort: 13
- jsonKey: ingressClass
sort: 14
Loading