Ingress: Introduce explicit ingress field in app configs
Change-Id: I79186f851b6a046b39b1045577e906f19c7be309
diff --git a/core/installer/values-tmpl/jenkins.cue b/core/installer/values-tmpl/jenkins.cue
index 991e340..c8ae998 100644
--- a/core/installer/values-tmpl/jenkins.cue
+++ b/core/installer/values-tmpl/jenkins.cue
@@ -13,19 +13,19 @@
_jenkinsServiceHTTPPortNumber: 80
-_ingressWithAuthProxy: _IngressWithAuthProxy & {
- inp: {
+ingress: {
+ jenkins: {
auth: enabled: false
network: networks.private
subdomain: input.subdomain
- serviceName: "jenkins"
- // TODO(gio): looks like this port config selection logic does not work.
- // Investigate and fix in app.go
- port: number: _jenkinsServiceHTTPPortNumber
+ service: {
+ name: "jenkins"
+ port: number: _jenkinsServiceHTTPPortNumber
+ }
}
}
-images: _ingressWithAuthProxy.out.images & {
+images: {
jenkins: {
repository: "jenkins"
name: "jenkins"
@@ -34,7 +34,7 @@
}
}
-charts: _ingressWithAuthProxy.out.charts & {
+charts: {
jenkins: {
chart: "charts/jenkins"
sourceRef: {
@@ -73,7 +73,7 @@
_oauth2ClientId: "client_id"
_oauth2ClientSecret: "client_secret"
-helm: _ingressWithAuthProxy.out.helm & {
+helm: {
"oauth2-client": {
chart: charts.oauth2Client
values: {