Ingress: Introduce explicit ingress field in app configs
Change-Id: I79186f851b6a046b39b1045577e906f19c7be309
diff --git a/core/installer/values-tmpl/pihole.cue b/core/installer/values-tmpl/pihole.cue
index 3f33842..cbce3c0 100644
--- a/core/installer/values-tmpl/pihole.cue
+++ b/core/installer/values-tmpl/pihole.cue
@@ -14,17 +14,19 @@
_serviceWebPort: 80
-_ingressWithAuthProxy: _IngressWithAuthProxy & {
- inp: {
+ingress: {
+ pihole: {
auth: input.auth
network: input.network
subdomain: input.subdomain
- serviceName: "pihole-web"
- port: number: _serviceWebPort
+ service: {
+ name: "pihole-web"
+ port: number: _serviceWebPort
+ }
}
}
-images: _ingressWithAuthProxy.out.images & {
+images: {
pihole: {
repository: "pihole"
name: "pihole"
@@ -33,7 +35,7 @@
}
}
-charts: _ingressWithAuthProxy.out.charts & {
+charts: {
pihole: {
chart: "charts/pihole"
sourceRef: {
@@ -44,7 +46,7 @@
}
}
-helm: _ingressWithAuthProxy.out.helm & {
+helm: {
pihole: {
chart: charts.pihole
values: {