Ingress: Introduce explicit ingress field in app configs
Change-Id: I79186f851b6a046b39b1045577e906f19c7be309
diff --git a/core/installer/values-tmpl/zot.cue b/core/installer/values-tmpl/zot.cue
index 305eb79..fa54dd8 100644
--- a/core/installer/values-tmpl/zot.cue
+++ b/core/installer/values-tmpl/zot.cue
@@ -15,20 +15,20 @@
description: "OCI-native container image registry, simplified"
icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 24 24'><path fill='currentColor' d='M21.231 2.462L7.18 20.923h14.564V24H2.256v-2.462L16.308 3.076H2.975V0h18.256z'/></svg>"
-_ingressWithAuthProxy: _IngressWithAuthProxy & {
- inp: {
- auth: {
- enabled: false
- }
+ingress: {
+ zot: {
+ auth: enabled: false
network: input.network
subdomain: input.subdomain
- serviceName: "zot"
- port: number: _httpPort // TODO(gio): make optional
+ service: {
+ name: "zot"
+ port: number: _httpPort // TODO(gio): make optional
+ }
}
}
// TODO(gio): configure busybox
-images: _ingressWithAuthProxy.out.images & {
+images: {
zot: {
registry: "ghcr.io"
repository: "project-zot"
@@ -38,7 +38,7 @@
}
}
-charts: _ingressWithAuthProxy.out.charts & {
+charts: {
zot: {
chart: "charts/zot"
sourceRef: {
@@ -67,7 +67,7 @@
_httpPort: 80
-helm: _ingressWithAuthProxy.out.helm & {
+helm: {
zot: {
chart: charts.zot
values: {