AppManager: Format cue files
Change-Id: Ia37908797b0227ab3b66e0faab08dcc2379e5282
diff --git a/core/installer/values-tmpl/headscale.cue b/core/installer/values-tmpl/headscale.cue
index c28926e..9bb2395 100644
--- a/core/installer/values-tmpl/headscale.cue
+++ b/core/installer/values-tmpl/headscale.cue
@@ -1,44 +1,44 @@
input: {
- network: #Network
+ network: #Network
subdomain: string
- ipSubnet: string
+ ipSubnet: string
}
-name: "headscale"
+name: "headscale"
namespace: "app-headscale"
-icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 48 48'><circle cx='24' cy='24' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='24' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='10' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='10' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='10' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='24' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='38' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='38' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='38' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='38' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='24' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='24' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='24' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/></svg>"
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 48 48'><circle cx='24' cy='24' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='24' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='10' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='10' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='10' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='24' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='38' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='38' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='38' r='4.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='38' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='24' cy='24' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='10' cy='24' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><circle cx='38' cy='24' r='2' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/></svg>"
-_domain: "\(input.subdomain).\(input.network.domain)"
+_domain: "\(input.subdomain).\(input.network.domain)"
_oauth2ClientSecretName: "oauth2-client"
out: {
images: {
headscale: {
repository: "headscale"
- name: "headscale"
- tag: "0.25.1"
+ name: "headscale"
+ tag: "0.25.1"
pullPolicy: "IfNotPresent"
}
api: {
repository: "giolekva"
- name: "headscale-api"
- tag: "latest"
+ name: "headscale-api"
+ tag: "latest"
pullPolicy: "Always"
}
}
charts: {
oauth2Client: {
- kind: "GitRepository"
+ kind: "GitRepository"
address: "https://code.v1.dodo.cloud/helm-charts"
- branch: "main"
- path: "charts/oauth2-client"
+ branch: "main"
+ path: "charts/oauth2-client"
}
headscale: {
- kind: "GitRepository"
+ kind: "GitRepository"
address: "https://code.v1.dodo.cloud/helm-charts"
- branch: "main"
- path: "charts/headscale"
+ branch: "main"
+ path: "charts/headscale"
}
}
@@ -47,11 +47,11 @@
chart: charts.oauth2Client
// TODO(gio): remove once hydra maester is installed as part of dodo itself
dependsOn: [{
- name: "auth"
+ name: "auth"
namespace: "\(global.namespacePrefix)core-auth"
}]
values: {
- name: "\(release.namespace)-headscale"
+ name: "\(release.namespace)-headscale"
secretName: _oauth2ClientSecretName
grantTypes: ["authorization_code"]
responseTypes: ["code"]
@@ -63,33 +63,33 @@
headscale: {
chart: charts.headscale
dependsOn: [{
- name: "auth"
+ name: "auth"
namespace: "\(global.namespacePrefix)core-auth"
}]
values: {
image: {
repository: images.headscale.fullName
- tag: images.headscale.tag
+ tag: images.headscale.tag
pullPolicy: images.headscale.pullPolicy
}
storage: size: "5Gi"
- ingressClassName: input.network.ingressClass
+ ingressClassName: input.network.ingressClass
certificateIssuer: input.network.certificateIssuer
- domain: _domain
- publicBaseDomain: input.network.domain
- ipAddressPool: "\(global.id)-headscale"
+ domain: _domain
+ publicBaseDomain: input.network.domain
+ ipAddressPool: "\(global.id)-headscale"
oauth2: {
secretName: _oauth2ClientSecretName
- issuer: "https://hydra.\(input.network.domain)"
+ issuer: "https://hydra.\(input.network.domain)"
}
api: {
- port: 8585
- ipSubnet: input.ipSubnet
- self: "http://headscale-api.\(release.namespace).svc.cluster"
+ port: 8585
+ ipSubnet: input.ipSubnet
+ self: "http://headscale-api.\(release.namespace).svc.cluster"
fetchUsersAddr: "http://memberships-api.\(global.namespacePrefix)core-auth-memberships.svc.cluster.local/api/users"
image: {
repository: images.api.fullName
- tag: images.api.tag
+ tag: images.api.tag
pullPolicy: images.api.pullPolicy
}
}
@@ -100,31 +100,31 @@
}
help: [{
- title: "Install"
+ title: "Install"
contents: """
You can install Tailscale client on any of your personal devices running: macOS, iOS, Windows, Lonux or Android. Installer packages can be found at: [https://tailscale.com/download](https://tailscale.com/download). After installing the client application you need to configure it to use https://\(_domain) as a login URL, so you can login to the VPN network with your dodo: account. See "Configure Login URL" section below for more details.
"""
children: [{
- title: "Widnows with MSI"
+ title: "Widnows with MSI"
contents: "[https://tailscale.com/kb/1189/install-windows-msi](https://tailscale.com/kb/1189/install-windows-msi)"
}]
}, {
- title: "Configure Login URL"
+ title: "Configure Login URL"
contents: "After installing the client application you need to configure it to use https://\(_domain) as a login URL, so you can login to the VPN network with your dodo: account"
children: [{
- title: "macOS"
+ title: "macOS"
contents: "[https://headscale.\(input.network.domain)/apple](https://headscale.\(input.network.domain)/apple)"
}, {
- title: "iOS"
+ title: "iOS"
contents: "[https://headscale.\(input.network.domain)/apple](https://headscale.\(input.network.domain)/apple)"
}, {
- title: "Windows"
+ title: "Windows"
contents: "[https://tailscale.com/kb/1318/windows-mdm](https://tailscale.com/kb/1318/windows-mdm)"
}, {
- title: "Linux"
+ title: "Linux"
contents: "tailscale up --login-server https://\(_domain)"
}, {
- title: "Android"
+ title: "Android"
contents: """
After opening the app, the kebab menu icon (three dots) on the top bar on the right must be repeatedly opened and closed until the Change server option appears in the menu. This is where you can enter your headscale URL: https://\(_domain)
@@ -133,7 +133,7 @@
After saving and restarting the app, selecting the regular Sign in option should open up the dodo: authentication page.
"""
}, {
- title: "Command Line"
+ title: "Command Line"
contents: "tailscale up --login-server https://\(_domain)"
}]
}]