From c0d42cc32b04ad7ec8b4cc32eb9d45bf55e11635 Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Wed, 2 Aug 2023 15:04:52 +0200
Subject: Add a - to helm-chart.yaml
---
.../oolah/base-system/certmanager/chart.yaml | 13 ---------
.../oolah/base-system/certmanager/helm-chart | 13 +++++++++
.../oolah/monitoring/grafana/helm-chart.yaml | 33 ++++++++++++++++++++++
.../oolah/monitoring/grafana/helmchart.yaml | 33 ----------------------
4 files changed, 46 insertions(+), 46 deletions(-)
delete mode 100644 data.d/k3s-master/manifests.d/oolah/base-system/certmanager/chart.yaml
create mode 100644 data.d/k3s-master/manifests.d/oolah/base-system/certmanager/helm-chart
create mode 100644 data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helm-chart.yaml
delete mode 100644 data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helmchart.yaml
diff --git a/data.d/k3s-master/manifests.d/oolah/base-system/certmanager/chart.yaml b/data.d/k3s-master/manifests.d/oolah/base-system/certmanager/chart.yaml
deleted file mode 100644
index 4350177..0000000
--- a/data.d/k3s-master/manifests.d/oolah/base-system/certmanager/chart.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-apiVersion: helm.cattle.io/v1
-kind: HelmChart
-metadata:
- name: certmanager
- namespace: kube-system
-spec:
- repo: https://charts.jetstack.io
- chart: cert-manager
- targetNamespace: base-system
- valuesContent: |
- installCRDs: true
-...
diff --git a/data.d/k3s-master/manifests.d/oolah/base-system/certmanager/helm-chart b/data.d/k3s-master/manifests.d/oolah/base-system/certmanager/helm-chart
new file mode 100644
index 0000000..4350177
--- /dev/null
+++ b/data.d/k3s-master/manifests.d/oolah/base-system/certmanager/helm-chart
@@ -0,0 +1,13 @@
+---
+apiVersion: helm.cattle.io/v1
+kind: HelmChart
+metadata:
+ name: certmanager
+ namespace: kube-system
+spec:
+ repo: https://charts.jetstack.io
+ chart: cert-manager
+ targetNamespace: base-system
+ valuesContent: |
+ installCRDs: true
+...
diff --git a/data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helm-chart.yaml b/data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helm-chart.yaml
new file mode 100644
index 0000000..20fc702
--- /dev/null
+++ b/data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helm-chart.yaml
@@ -0,0 +1,33 @@
+---
+apiVersion: helm.cattle.io/v1
+kind: HelmChart
+metadata:
+ name: grafana
+ namespace: kube-system
+spec:
+ repo: https://grafana.github.io/helm-charts
+ chart: grafana
+ targetNamespace: monitoring
+ valuesContent: |-
+ ingress:
+ enabled: true
+ ingressClassName: "traefik"
+ annotations:
+ cert-manager.io/cluster-issuer: "letsencrypt-production"
+ tls:
+ - hosts:
+ - grafana.tyil.nl
+ secretName: tls-nl.tyil.grafana
+ hosts:
+ - "grafana.tyil.nl"
+ envFromSecret: "grafana-env"
+ grafana.ini:
+ auth.ldap:
+ enabled: true
+ allow_sign_up: true
+ database:
+ type: "postgres"
+ ldap:
+ enabled: true
+ existingSecret: grafana-config
+...
diff --git a/data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helmchart.yaml b/data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helmchart.yaml
deleted file mode 100644
index 20fc702..0000000
--- a/data.d/k3s-master/manifests.d/oolah/monitoring/grafana/helmchart.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-apiVersion: helm.cattle.io/v1
-kind: HelmChart
-metadata:
- name: grafana
- namespace: kube-system
-spec:
- repo: https://grafana.github.io/helm-charts
- chart: grafana
- targetNamespace: monitoring
- valuesContent: |-
- ingress:
- enabled: true
- ingressClassName: "traefik"
- annotations:
- cert-manager.io/cluster-issuer: "letsencrypt-production"
- tls:
- - hosts:
- - grafana.tyil.nl
- secretName: tls-nl.tyil.grafana
- hosts:
- - "grafana.tyil.nl"
- envFromSecret: "grafana-env"
- grafana.ini:
- auth.ldap:
- enabled: true
- allow_sign_up: true
- database:
- type: "postgres"
- ldap:
- enabled: true
- existingSecret: grafana-config
-...
--
cgit v1.1