diff --git a/apps/dgraph/kustomization.yaml b/apps/dgraph/kustomization.yaml deleted file mode 100644 index d213113..0000000 --- a/apps/dgraph/kustomization.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: dgraph -helmCharts: - - name: dgraph - repo: https://charts.dgraph.io - version: 24.0.5 - releaseName: dgraph - namespace: dgraph - includeCRDs: true - valuesInline: - zero: - persistence: - enabled: true - storageClass: longhorn - size: 20Gi - alpha: - persistence: - enabled: true - storageClass: longhorn - size: 10Gi - ingress: - enabled: true - hostname: alpha.dgraph.lan - ingressClassName: traefik - ingress_grpc: - enabled: true - hostname: alpha-grpc.dgraph.lan - ingressClassName: traefik - ratel: - enabled: true - ingress: - enabled: true - hostname: ratel.dgraph.lan - ingressClassName: traefik diff --git a/bootstrap/appset-helm.yaml b/bootstrap/appset-helm.yaml index cd71c7c..d2d63af 100644 --- a/bootstrap/appset-helm.yaml +++ b/bootstrap/appset-helm.yaml @@ -8,15 +8,26 @@ spec: goTemplate: true goTemplateOptions: ["missingkey=error"] generators: - - matrix: - generators: - - git: - repoURL: https://github.com/gregkonush/lab.git - revision: main - files: - - path: bootstrap/appset-values.yaml - - list: - elementsYaml: "{{ .apps | toJson }}" + - list: + elements: + - name: spark + namespace: spark + repoUrl: registry-1.docker.io/bitnamicharts + chart: spark + version: 9.2.14 + releaseName: spark + - name: dgraph + namespace: dgraph + repoUrl: https://charts.dgraph.io + chart: dgraph + version: 24.0.5 + releaseName: dgraph + customValues: true + valuesObject: + zero: + persistence: + storageClass: longhorn + size: 20Gi template: metadata: name: "{{.name}}" @@ -33,10 +44,18 @@ spec: syncOptions: - CreateNamespace=true - ServerSideApply=true - sources: - - repoURL: "{{.repoUrl}}" - chart: "{{.chart}}" - targetRevision: "{{.version}}" - helm: - releaseName: "{{.releaseName}}" - skipCrds: false + source: + repoURL: "{{.repoUrl}}" + chart: "{{.chart}}" + targetRevision: "{{.version}}" + helm: + releaseName: "{{.releaseName}}" + skipCrds: false + templatePatch: | + {{- if .customValues }} + spec: + source: + helm: + valuesObject: + {{ .valuesObject }} + {{- end }}