Ingress: Introduce explicit ingress field in app configs
Change-Id: I79186f851b6a046b39b1045577e906f19c7be309
diff --git a/core/installer/values-tmpl/url-shortener.cue b/core/installer/values-tmpl/url-shortener.cue
index a6e95ab..b95dd7c 100644
--- a/core/installer/values-tmpl/url-shortener.cue
+++ b/core/installer/values-tmpl/url-shortener.cue
@@ -14,17 +14,19 @@
_httpPortName: "http"
-_ingressWithAuthProxy: _IngressWithAuthProxy & {
- inp: {
+ingress: {
+ "url-shorteners": {
auth: input.auth
network: input.network
subdomain: input.subdomain
- serviceName: "url-shortener"
- port: name: _httpPortName
+ service: {
+ name: "url-shortener"
+ port: name: _httpPortName
+ }
}
}
-images: _ingressWithAuthProxy.out.images & {
+images: {
urlShortener: {
repository: "giolekva"
name: "url-shortener"
@@ -33,7 +35,7 @@
}
}
-charts: _ingressWithAuthProxy.out.charts & {
+charts: {
urlShortener: {
chart: "charts/url-shortener"
sourceRef: {
@@ -44,7 +46,7 @@
}
}
-helm: _ingressWithAuthProxy.out.helm & {
+helm: {
"url-shortener": {
chart: charts.urlShortener
values: {