installer: create namespaces with kube client
diff --git a/core/installer/values-tmpl/cert-manager-webhook-gandi-role.yaml b/core/installer/values-tmpl/cert-manager-webhook-gandi-role.yaml
index f0f9b93..ef0b383 100644
--- a/core/installer/values-tmpl/cert-manager-webhook-gandi-role.yaml
+++ b/core/installer/values-tmpl/cert-manager-webhook-gandi-role.yaml
@@ -2,12 +2,11 @@
kind: HelmRelease
metadata:
name: cert-manager-webhook-gandi-role
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Global.PCloudEnvName }}-cert-manager
spec:
- targetNamespace: {{ .Global.PCloudEnvName }}-cert-manager
dependsOn:
- name: cert-manager
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Global.PCloudEnvName }}-cert-manager
chart:
spec:
chart: charts/cert-manager-webhook-gandi-role
diff --git a/core/installer/values-tmpl/cert-manager-webhook-gandi.yaml b/core/installer/values-tmpl/cert-manager-webhook-gandi.yaml
index fdcc030..bbadd91 100644
--- a/core/installer/values-tmpl/cert-manager-webhook-gandi.yaml
+++ b/core/installer/values-tmpl/cert-manager-webhook-gandi.yaml
@@ -2,12 +2,11 @@
kind: HelmRelease
metadata:
name: cert-manager-webhook-gandi
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Global.PCloudEnvName }}-cert-manager
spec:
- targetNamespace: {{ .Global.PCloudEnvName }}-cert-manager
dependsOn:
- name: cert-manager
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Global.PCloudEnvName }}-cert-manager # TODO(giolekva): derivative
chart:
spec:
chart: charts/cert-manager-webhook-gandi
diff --git a/core/installer/values-tmpl/cert-manager.yaml b/core/installer/values-tmpl/cert-manager.yaml
index db00d34..c5bb9ac 100644
--- a/core/installer/values-tmpl/cert-manager.yaml
+++ b/core/installer/values-tmpl/cert-manager.yaml
@@ -1,35 +1,12 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-cert-manager
- namespace: {{ .Global.PCloudEnvName }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: {{ .Global.PCloudEnvName }}
- namespace: {{ .Global.PCloudEnvName }}
- interval: 1m0s
- values:
- pcloudInstanceId: ""
- namespacePrefix: {{ .Global.PCloudEnvName }}-
- namespaces:
- - cert-manager
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: cert-manager
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.PCloudEnvName }}-cert-manager
dependsOn:
- - name: namespaces-cert-manager
- namespace: {{ .Global.PCloudEnvName }}
- name: ingress-public
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Global.PCloudEnvName }}-ingress-public # TODO(giolekva): derivative
chart:
spec:
chart: charts/cert-manager
diff --git a/core/installer/values-tmpl/certificate-issuer-private.yaml b/core/installer/values-tmpl/certificate-issuer-private.yaml
index a9cc706..09209d0 100644
--- a/core/installer/values-tmpl/certificate-issuer-private.yaml
+++ b/core/installer/values-tmpl/certificate-issuer-private.yaml
@@ -2,12 +2,11 @@
kind: HelmRelease
metadata:
name: certificate-issuer-private
- namespace: {{ .Global.Id }}
+ namespace: {{ .Global.Id }}-ingress-private
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}ingress-private
dependsOn:
- name: ingress-private
- namespace: {{ .Global.Id }}
+ namespace: {{ .Global.Id }}-ingress-private
chart:
spec:
chart: charts/certificate-issuer-private
diff --git a/core/installer/values-tmpl/certificate-issuer-public.yaml b/core/installer/values-tmpl/certificate-issuer-public.yaml
index 907954a..5755f0f 100644
--- a/core/installer/values-tmpl/certificate-issuer-public.yaml
+++ b/core/installer/values-tmpl/certificate-issuer-public.yaml
@@ -2,13 +2,12 @@
kind: HelmRelease
metadata:
name: certificate-issuer-public
- namespace: {{ .Global.Id }}
-spec:
# TODO(giolekva): is there better namespace for this?
- targetNamespace: {{ .Global.NamespacePrefix }}ingress-private
+ namespace: {{ .Global.Id }}-ingress-private
+spec:
dependsOn:
- name: ingress-private
- namespace: {{ .Global.Id }}
+ namespace: {{ .Global.Id }}-ingress-private
chart:
spec:
chart: charts/certificate-issuer-public
diff --git a/core/installer/values-tmpl/core-auth-storage.yaml b/core/installer/values-tmpl/core-auth-storage.yaml
index 9040b62..368b433 100644
--- a/core/installer/values-tmpl/core-auth-storage.yaml
+++ b/core/installer/values-tmpl/core-auth-storage.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-core-auth
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - core-auth
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: core-auth-storage
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}core-auth
- dependsOn:
- - name: namespaces-core-auth
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/postgresql
diff --git a/core/installer/values-tmpl/core-auth.yaml b/core/installer/values-tmpl/core-auth.yaml
index 856fb4c..7a1b7a1 100644
--- a/core/installer/values-tmpl/core-auth.yaml
+++ b/core/installer/values-tmpl/core-auth.yaml
@@ -2,14 +2,13 @@
kind: HelmRelease
metadata:
name: core-auth
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}core-auth
dependsOn:
- name: core-auth-storage
- namespace: {{ .Global.Id }}
- - name: ingress-private
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
+ - name: ingress-private # TODO(giolekva): is this needed?
+ namespace: {{ .Global.Id }}-ingress-private
chart:
spec:
chart: charts/auth
@@ -76,7 +75,7 @@
enabled: false
config:
version: v0.7.1-alpha.1
- dsn: postgres://kratos:kratos@postgres.lekva-core-auth.svc:5432/kratos?sslmode=disable&max_conns=20&max_idle_conns=4
+ dsn: postgres://kratos:kratos@postgres.{{ .Globa.Id }}-core-auth.svc:5432/kratos?sslmode=disable&max_conns=20&max_idle_conns=4
serve:
public:
base_url: https://accounts.{{ .Global.Domain }}
@@ -247,7 +246,7 @@
enabled: true
config:
version: v1.10.6
- dsn: postgres://hydra:hydra@postgres.lekva-core-auth.svc:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
+ dsn: postgres://hydra:hydra@postgres.{{ .Globa.Id }}-core-auth.svc:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
serve:
cookies:
same_site_mode: None
@@ -299,4 +298,4 @@
ingressClassName: {{ .Global.PCloudEnvName }}-ingress-public
domain: {{ .Global.Domain }}
internalDomain: p.{{ .Global.Domain }}
- hydra: hydra-admin.lekva-core-auth.svc.cluster.local
+ hydra: hydra-admin.{{ .Globa.Id }}-core-auth.svc.cluster.local
diff --git a/core/installer/values-tmpl/csi-driver-smb.yaml b/core/installer/values-tmpl/csi-driver-smb.yaml
index 9a2cf36..9297d0f 100644
--- a/core/installer/values-tmpl/csi-driver-smb.yaml
+++ b/core/installer/values-tmpl/csi-driver-smb.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-csi-driver-smb
- namespace: {{ .Global.PCloudEnvName }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: {{ .Global.PCloudEnvName }}
- namespace: {{ .Global.PCloudEnvName }}
- interval: 1m0s
- values:
- pcloudInstanceId: ""
- namespacePrefix: {{ .Global.PCloudEnvName }}-
- namespaces:
- - csi-driver-smb
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: csi-driver-smb
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.PCloudEnvName }}-csi-driver-smb
- dependsOn:
- - name: namespaces-csi-driver-smb
- namespace: {{ .Global.PCloudEnvName }}
chart:
spec:
chart: charts/csi-driver-smb
diff --git a/core/installer/values-tmpl/env-manager.yaml b/core/installer/values-tmpl/env-manager.yaml
index 691693b..b64ce09 100644
--- a/core/installer/values-tmpl/env-manager.yaml
+++ b/core/installer/values-tmpl/env-manager.yaml
@@ -2,7 +2,7 @@
kind: HelmRelease
metadata:
name: env-manager
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Release.Namespace }}
spec:
chart:
spec:
diff --git a/core/installer/values-tmpl/headscale-controller.yaml b/core/installer/values-tmpl/headscale-controller.yaml
index 3285f58..f799d9b 100644
--- a/core/installer/values-tmpl/headscale-controller.yaml
+++ b/core/installer/values-tmpl/headscale-controller.yaml
@@ -1,32 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-headscale-controller
- namespace: {{ .Global.PCloudEnvName }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.PCloudEnvName }}
- interval: 1m0s
- values:
- namespacePrefix: {{ .Global.PCloudEnvName }}-
- namespaces:
- - headscale-controller
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: headscale-controller
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.PCloudEnvName }}-headscale-controller
- dependsOn:
- - name: namespaces-headscale-controller
- namespace: {{ .Global.PCloudEnvName }}
chart:
spec:
chart: charts/headscale-controller
diff --git a/core/installer/values-tmpl/headscale.yaml b/core/installer/values-tmpl/headscale.yaml
index 8c16b86..c3894c2 100644
--- a/core/installer/values-tmpl/headscale.yaml
+++ b/core/installer/values-tmpl/headscale.yaml
@@ -1,35 +1,12 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-headscale
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-headscale
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: headscale
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-headscale
dependsOn:
- - name: namespaces-headscale
- namespace: {{ .Global.Id }}
- name: core-auth
- namespace: {{ .Global.Id }}
+ namespace: {{ .Global.NamespacePrefix }}core-auth
chart:
spec:
chart: charts/headscale
diff --git a/core/installer/values-tmpl/ingress-private.yaml b/core/installer/values-tmpl/ingress-private.yaml
index 0874b72..e1870af 100644
--- a/core/installer/values-tmpl/ingress-private.yaml
+++ b/core/installer/values-tmpl/ingress-private.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-ingress-private
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - ingress-private
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: ingress-private
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}ingress-private
- dependsOn:
- - name: namespaces-ingress-private
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/ingress-nginx
diff --git a/core/installer/values-tmpl/ingress-public.yaml b/core/installer/values-tmpl/ingress-public.yaml
index 80a5efd..67ac1b2 100644
--- a/core/installer/values-tmpl/ingress-public.yaml
+++ b/core/installer/values-tmpl/ingress-public.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-ingress-public
- namespace: {{ .Global.PCloudEnvName }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: {{ .Global.PCloudEnvName }}
- namespace: {{ .Global.PCloudEnvName }}
- interval: 1m0s
- values:
- pcloudInstanceId: ""
- namespacePrefix: {{ .Global.PCloudEnvName }}-
- namespaces:
- - ingress-public
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: ingress-public
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.PCloudEnvName }}-ingress-public
- dependsOn:
- - name: namespaces-ingress-public
- namespace: {{ .Global.PCloudEnvName }}
chart:
spec:
chart: charts/ingress-nginx
diff --git a/core/installer/values-tmpl/jellyfin.yaml b/core/installer/values-tmpl/jellyfin.yaml
index 2ef63ee..d486072 100644
--- a/core/installer/values-tmpl/jellyfin.yaml
+++ b/core/installer/values-tmpl/jellyfin.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-jellyfin
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-jellyfin
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: jellyfin
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-jellyfin
- dependsOn:
- - name: namespaces-jellyfin
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/jellyfin
diff --git a/core/installer/values-tmpl/maddy.yaml b/core/installer/values-tmpl/maddy.yaml
index c7d8dd7..31a96e1 100644
--- a/core/installer/values-tmpl/maddy.yaml
+++ b/core/installer/values-tmpl/maddy.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-maddy
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-maddy
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: maddy
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-maddy
- dependsOn:
- - name: namespaces-maddy
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/maddy
diff --git a/core/installer/values-tmpl/matrix-storage.yaml b/core/installer/values-tmpl/matrix-storage.yaml
index 87f1657..47ee9c0 100644
--- a/core/installer/values-tmpl/matrix-storage.yaml
+++ b/core/installer/values-tmpl/matrix-storage.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-matrix
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-matrix
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: matrix-storage
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-matrix
- dependsOn:
- - name: namespaces-matrix
- namespace: {{ .Global.Id }}
chart:
spec:
chart: postgresql
diff --git a/core/installer/values-tmpl/matrix.yaml b/core/installer/values-tmpl/matrix.yaml
index ecc36fe..d3e3a03 100644
--- a/core/installer/values-tmpl/matrix.yaml
+++ b/core/installer/values-tmpl/matrix.yaml
@@ -2,12 +2,11 @@
kind: HelmRelease
metadata:
name: matrix
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-matrix
dependsOn:
- name: matrix-storage
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
chart:
spec:
chart: charts/matrix
diff --git a/core/installer/values-tmpl/metallb-config-env.yaml b/core/installer/values-tmpl/metallb-config-env.yaml
index 39907e4..defa5ec 100644
--- a/core/installer/values-tmpl/metallb-config-env.yaml
+++ b/core/installer/values-tmpl/metallb-config-env.yaml
@@ -1,8 +1,8 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: meteallb-config-env # TODO(giolekva): typo metea
- namespace: {{ .Global.Id }}
+ name: metallb-config-env
+ namespace: {{ .Release.Namespace }}
spec:
chart:
spec:
diff --git a/core/installer/values-tmpl/pihole.yaml b/core/installer/values-tmpl/pihole.yaml
index 51e3d97..5b9d963 100644
--- a/core/installer/values-tmpl/pihole.yaml
+++ b/core/installer/values-tmpl/pihole.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-pihole
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-pihole
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: pihole
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-pihole
- dependsOn:
- - name: namespaces-pihole
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/pihole
diff --git a/core/installer/values-tmpl/qbittorrent.yaml b/core/installer/values-tmpl/qbittorrent.yaml
index 346a933..0597595 100644
--- a/core/installer/values-tmpl/qbittorrent.yaml
+++ b/core/installer/values-tmpl/qbittorrent.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-qbittorrent
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-qbittorrent
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: qbittorrent
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- namespace: {{ .Global.NamespacePrefix }}app-qbittorrent
- dependsOn:
- - name: namespaces-qbittorrent
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/qbittorrent
diff --git a/core/installer/values-tmpl/resource-renderer-controller.yaml b/core/installer/values-tmpl/resource-renderer-controller.yaml
index 72cf68b..7ffa9d0 100644
--- a/core/installer/values-tmpl/resource-renderer-controller.yaml
+++ b/core/installer/values-tmpl/resource-renderer-controller.yaml
@@ -1,32 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-rr-controller
- namespace: {{ .Global.PCloudEnvName }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.PCloudEnvName }}
- interval: 1m0s
- values:
- namespacePrefix: {{ .Global.PCloudEnvName }}-
- namespaces:
- - rr-controller
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: rr-controller
- namespace: {{ .Global.PCloudEnvName }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.PCloudEnvName }}-rr-controller
- dependsOn:
- - name: namespaces-rr-controller
- namespace: {{ .Global.PCloudEnvName }}
chart:
spec:
chart: charts/resource-renderer-controller
diff --git a/core/installer/values-tmpl/tailscale-proxy.yaml b/core/installer/values-tmpl/tailscale-proxy.yaml
index 9664e51..5ceae75 100644
--- a/core/installer/values-tmpl/tailscale-proxy.yaml
+++ b/core/installer/values-tmpl/tailscale-proxy.yaml
@@ -1,35 +1,12 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-tailscale-proxy
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - tailscale-proxy
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: tailscale-proxy
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}tailscale-proxy
dependsOn:
- - name: namespaces-tailscale-proxy
- namespace: {{ .Global.Id }}
- name: headscale
- namespace: {{ .Global.Id }}
+ namespace: {{ .Global.NamespacePrefix }}app-headscale
chart:
spec:
chart: charts/tailscale
diff --git a/core/installer/values-tmpl/vaultwarden.yaml b/core/installer/values-tmpl/vaultwarden.yaml
index 71046d4..4419776 100644
--- a/core/installer/values-tmpl/vaultwarden.yaml
+++ b/core/installer/values-tmpl/vaultwarden.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-vaultwarden
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-vaultwarden
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: vaultwarden
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-vaultwarden
- dependsOn:
- - name: namespaces-vaultwarden
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/vaultwarden
diff --git a/core/installer/values-tmpl/vpn-mesh-config.yaml b/core/installer/values-tmpl/vpn-mesh-config.yaml
index d42e1c8..2604eeb 100644
--- a/core/installer/values-tmpl/vpn-mesh-config.yaml
+++ b/core/installer/values-tmpl/vpn-mesh-config.yaml
@@ -2,7 +2,7 @@
kind: HelmRelease
metadata:
name: vpn-mesh-config
- namespace: {{ .Values.NamespacePrefix }}ingress-private
+ namespace: {{ .Release.NamespacePrefix }}ingress-private
spec:
chart:
spec:
diff --git a/core/installer/values-tmpl/welcome.yaml b/core/installer/values-tmpl/welcome.yaml
index 9f4c298..93556e3 100644
--- a/core/installer/values-tmpl/welcome.yaml
+++ b/core/installer/values-tmpl/welcome.yaml
@@ -1,33 +1,9 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: namespaces-welcome
- namespace: {{ .Global.Id }}
-spec:
- chart:
- spec:
- chart: charts/namespaces
- sourceRef:
- kind: GitRepository
- name: pcloud
- namespace: {{ .Global.Id }}
- interval: 1m0s
- values:
- pcloudInstanceId: {{ .Global.Id }}
- namespacePrefix: {{ .Global.NamespacePrefix }}
- namespaces:
- - app-welcome
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
name: welcome
- namespace: {{ .Global.Id }}
+ namespace: {{ .Release.Namespace }}
spec:
- targetNamespace: {{ .Global.NamespacePrefix }}app-welcome
- dependsOn:
- - name: namespaces-welcome
- namespace: {{ .Global.Id }}
chart:
spec:
chart: charts/welcome
@@ -41,5 +17,5 @@
sshPrivateKey: {{ .Values.SSHPrivateKey | b64enc }}
ingress:
className: {{ .Global.PCloudEnvName }}-ingress-public
- domain: {{ .Global.Domain }}
+ domain: welcome.{{ .Global.Domain }}
certificateIssuer: {{ .Global.Id }}-public