Compare commits

...

1 Commits

Author SHA1 Message Date
Andrei Kvapil
bef45f030b fix: full-distro bundle installation 2024-04-01 21:24:48 +02:00
2 changed files with 20 additions and 8 deletions

View File

@@ -7,6 +7,13 @@ releases:
namespace: cozy-cilium namespace: cozy-cilium
privileged: true privileged: true
dependsOn: [] dependsOn: []
values:
cilium:
cni:
chainingMode: ~
customConf: false
configMap: ""
enableIPv4Masquerade: true
- name: fluxcd - name: fluxcd
releaseName: fluxcd releaseName: fluxcd
@@ -93,4 +100,4 @@ releases:
releaseName: traffic-manager releaseName: traffic-manager
chart: cozy-telepresence chart: cozy-telepresence
namespace: cozy-telepresence namespace: cozy-telepresence
dependsOn: [kubeovn] dependsOn: []

View File

@@ -1,7 +1,10 @@
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
{{- $bundleName := index $cozyConfig.data "bundle-name" }}
{{- $bundle := tpl (.Files.Get (printf "bundles/%s.yaml" $bundleName)) . | fromYaml }}
{{- $host := "example.org" }} {{- $host := "example.org" }}
{{- $tenantRoot := list }} {{- $tenantRoot := list }}
{{- if .Capabilities.APIVersions.Has "helm.toolkit.fluxcd.io/v2beta1" }} {{- if .Capabilities.APIVersions.Has "helm.toolkit.fluxcd.io/v2beta2" }}
{{- $tenantRoot = lookup "helm.toolkit.fluxcd.io/v2beta1" "HelmRelease" "tenant-root" "tenant-root" }} {{- $tenantRoot = lookup "helm.toolkit.fluxcd.io/v2beta2" "HelmRelease" "tenant-root" "tenant-root" }}
{{- end }} {{- end }}
{{- if and $tenantRoot $tenantRoot.spec $tenantRoot.spec.values $tenantRoot.spec.values.host }} {{- if and $tenantRoot $tenantRoot.spec $tenantRoot.spec.values $tenantRoot.spec.values.host }}
{{- $host = $tenantRoot.spec.values.host }} {{- $host = $tenantRoot.spec.values.host }}
@@ -19,7 +22,7 @@ metadata:
namespace.cozystack.io/host: "{{ $host }}" namespace.cozystack.io/host: "{{ $host }}"
name: tenant-root name: tenant-root
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta1 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
metadata: metadata:
name: tenant-root name: tenant-root
@@ -45,7 +48,9 @@ spec:
values: values:
host: "{{ $host }}" host: "{{ $host }}"
dependsOn: dependsOn:
- name: cilium {{- range $x := $bundle.releases }}
namespace: cozy-cilium {{- if has $x.name (list "cilium" "kubeovn") }}
- name: kubeovn - name: {{ $x.name }}
namespace: cozy-kubeovn namespace: {{ $x.namespace }}
{{- end }}
{{- end }}