Installer: auto generate target service namespace in port forwards
Change-Id: Id7e0dcdd750034375c796881e86b1f3eb53e9299
diff --git a/core/installer/app_configs/app_base.cue b/core/installer/app_configs/app_base.cue
index 97de21d..428fbc8 100644
--- a/core/installer/app_configs/app_base.cue
+++ b/core/installer/app_configs/app_base.cue
@@ -86,7 +86,8 @@
reservator: string
protocol: "TCP" | "UDP" | *"TCP"
sourcePort: int
- targetService: string
+ serviceName: string
+ targetService: "\(release.namespace)/\(serviceName)"
targetPort: int
}
diff --git a/core/installer/values-tmpl/dodo-app.cue b/core/installer/values-tmpl/dodo-app.cue
index 238b142..e9fcebe 100644
--- a/core/installer/values-tmpl/dodo-app.cue
+++ b/core/installer/values-tmpl/dodo-app.cue
@@ -57,9 +57,7 @@
allocator: input.network.allocatePortAddr
reservator: input.network.reservePortAddr
sourcePort: input.sshPort
- // TODO(gio): namespace part must be populated by app manager. Otherwise
- // third-party app developer might point to a service from different namespace.
- targetService: "\(release.namespace)/soft-serve"
+ serviceName: "soft-serve"
targetPort: 22
}]
diff --git a/core/installer/values-tmpl/gerrit.cue b/core/installer/values-tmpl/gerrit.cue
index c68e9ac..a2a88f9 100644
--- a/core/installer/values-tmpl/gerrit.cue
+++ b/core/installer/values-tmpl/gerrit.cue
@@ -107,9 +107,7 @@
allocator: input.network.allocatePortAddr
reservator: input.network.reservePortAddr
sourcePort: input.sshPort
- // TODO(gio): namespace part must be populated by app manager. Otherwise
- // third-party app developer might point to a service from different namespace.
- targetService: "\(release.namespace)/gerrit-gerrit-service"
+ serviceName: "gerrit-gerrit-service"
targetPort: _sshPort
}]
diff --git a/core/installer/values-tmpl/soft-serve.cue b/core/installer/values-tmpl/soft-serve.cue
index 10da2ac..d172b9b 100644
--- a/core/installer/values-tmpl/soft-serve.cue
+++ b/core/installer/values-tmpl/soft-serve.cue
@@ -48,9 +48,7 @@
allocator: input.network.allocatePortAddr
reservator: input.network.reservePortAddr
sourcePort: input.sshPort
- // TODO(gio): namespace part must be populated by app manager. Otherwise
- // third-party app developer might point to a service from different namespace.
- targetService: "\(release.namespace)/soft-serve"
+ serviceName: "soft-serve"
targetPort: 22
}]