Ingress: Introduce explicit ingress field in app configs
Change-Id: I79186f851b6a046b39b1045577e906f19c7be309
diff --git a/core/installer/values-tmpl/appmanager.cue b/core/installer/values-tmpl/appmanager.cue
index ba2ad56..7c110b5 100644
--- a/core/installer/values-tmpl/appmanager.cue
+++ b/core/installer/values-tmpl/appmanager.cue
@@ -14,20 +14,22 @@
_subdomain: "apps"
_httpPortName: "http"
-_ingressWithAuthProxy: _IngressWithAuthProxy & {
- inp: {
+ingress: {
+ appmanager: {
auth: {
enabled: true
groups: input.authGroups
}
network: networks.private
subdomain: _subdomain
- serviceName: "appmanager"
- port: name: _httpPortName
+ service: {
+ name: "appmanager"
+ port: name: _httpPortName
+ }
}
}
-images: _ingressWithAuthProxy.out.images & {
+images: {
appmanager: {
repository: "giolekva"
name: "pcloud-installer"
@@ -36,7 +38,7 @@
}
}
-charts: _ingressWithAuthProxy.out.charts & {
+charts: {
appmanager: {
chart: "charts/appmanager"
sourceRef: {
@@ -47,7 +49,7 @@
}
}
-helm: _ingressWithAuthProxy.out.helm & {
+helm: {
appmanager: {
chart: charts.appmanager
values: {