Ingress: Introduce explicit ingress field in app configs
Change-Id: I79186f851b6a046b39b1045577e906f19c7be309
diff --git a/core/installer/values-tmpl/memberships.cue b/core/installer/values-tmpl/memberships.cue
index da70026..aa0ac59 100644
--- a/core/installer/values-tmpl/memberships.cue
+++ b/core/installer/values-tmpl/memberships.cue
@@ -13,20 +13,22 @@
_httpPortName: "http"
-_ingressWithAuthProxy: _IngressWithAuthProxy & {
- inp: {
+ingress: {
+ memberships: {
auth: {
enabled: true
groups: input.authGroups
}
network: networks.private
subdomain: _subdomain
- serviceName: "memberships"
- port: name: _httpPortName
+ service: {
+ name: "memberships"
+ port: name: _httpPortName
+ }
}
}
-images: _ingressWithAuthProxy.out.images & {
+images: {
memberships: {
repository: "giolekva"
name: "memberships"
@@ -35,7 +37,7 @@
}
}
-charts: _ingressWithAuthProxy.out.charts & {
+charts: {
memberships: {
chart: "charts/memberships"
sourceRef: {
@@ -46,7 +48,7 @@
}
}
-helm: _ingressWithAuthProxy.out.helm & {
+helm: {
memberships: {
chart: charts.memberships
values: {