From 0449d1a4c308fb21281a1d108016036565ef0ce7 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 10 Apr 2023 09:32:18 -0400 Subject: [PATCH] added prometheus + generic version loading --- .vscode/settings.json | 7 +----- k8s/charts/templates/app-cert-manager.yaml | 2 +- .../templates/app-external-secrets.yaml | 2 +- k8s/charts/templates/app-nfs-storage.yaml | 2 +- k8s/charts/templates/app-prometheus.yaml | 22 +++++++++++++++++++ .../templates/app-secrets-generator.yaml | 2 +- k8s/charts/values.yaml | 6 +++++ 7 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 k8s/charts/templates/app-prometheus.yaml diff --git a/.vscode/settings.json b/.vscode/settings.json index dd97f70..9e26dfe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1 @@ -{ - "yaml.schemas": { - "https://raw.githubusercontent.com/rancher/k3d/main/pkg/config/config.versions.schema.json": "file:///workspaces/HomelabV2/k3d-default.yaml", - "https://json.schemastore.org/helmfile.json": "file:///home/ari/Projects/HomelabV2/k8s/infra/database/templates/user-generation/users-job.yaml" - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/k8s/charts/templates/app-cert-manager.yaml b/k8s/charts/templates/app-cert-manager.yaml index 5c3e7c1..1a32d8f 100644 --- a/k8s/charts/templates/app-cert-manager.yaml +++ b/k8s/charts/templates/app-cert-manager.yaml @@ -9,7 +9,7 @@ spec: source: chart: cert-manager repoURL: "https://charts.jetstack.io" - targetRevision: "1.10.2" + targetRevision: "{{ .Values.chartVersions.certManager }}" helm: values: |- installCRDs: true diff --git a/k8s/charts/templates/app-external-secrets.yaml b/k8s/charts/templates/app-external-secrets.yaml index 62d518a..73c3b2f 100644 --- a/k8s/charts/templates/app-external-secrets.yaml +++ b/k8s/charts/templates/app-external-secrets.yaml @@ -9,7 +9,7 @@ spec: source: chart: external-secrets repoURL: "https://charts.external-secrets.io" - targetRevision: "0.7.2" + targetRevision: "{{ .Values.chartVersions.externalSecrets }}" helm: values: |- installCRDs: true diff --git a/k8s/charts/templates/app-nfs-storage.yaml b/k8s/charts/templates/app-nfs-storage.yaml index 15df78f..e419669 100644 --- a/k8s/charts/templates/app-nfs-storage.yaml +++ b/k8s/charts/templates/app-nfs-storage.yaml @@ -9,7 +9,7 @@ spec: source: chart: nfs-subdir-external-provisioner repoURL: "https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/" - targetRevision: "v4.0.2" + targetRevision: "{{ .Values.chartVersions.nfs }}" helm: releaseName: nfs-subdir-external-provisioner parameters: diff --git a/k8s/charts/templates/app-prometheus.yaml b/k8s/charts/templates/app-prometheus.yaml new file mode 100644 index 0000000..0c8eb4a --- /dev/null +++ b/k8s/charts/templates/app-prometheus.yaml @@ -0,0 +1,22 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: "monitoring-prometheus" + namespace: "{{ .Release.Namespace }}" +spec: + project: meta-infrastructure + source: + chart: prometheus + repoURL: "https://prometheus-community.github.io/helm-charts" + targetRevision: "{{ .Values.chartVersions.prometheus }}" + helm: + releaseName: prometheus + destination: + server: https://kubernetes.default.svc + namespace: "monitoring" + syncPolicy: + automated: + selfHeal: true + syncOptions: + - CreateNamespace=true diff --git a/k8s/charts/templates/app-secrets-generator.yaml b/k8s/charts/templates/app-secrets-generator.yaml index 9314875..d2325c4 100644 --- a/k8s/charts/templates/app-secrets-generator.yaml +++ b/k8s/charts/templates/app-secrets-generator.yaml @@ -9,7 +9,7 @@ spec: source: chart: kubernetes-secret-generator repoURL: "https://helm.mittwald.de" - targetRevision: "v3.4.0" + targetRevision: "{{ .Values.chartVersions.kubernetesSecretGenerator }}" helm: releaseName: kubernetes-secret-generator destination: diff --git a/k8s/charts/values.yaml b/k8s/charts/values.yaml index cda7db3..326d349 100644 --- a/k8s/charts/values.yaml +++ b/k8s/charts/values.yaml @@ -1,2 +1,8 @@ nfs: share: "/" +chartVersions: + prometheus: "20.2.0" + kubernetesSecretGenerator: "v3.4.0" + nfs: "v4.0.2" + externalSecrets: "0.7.2" + certManager: "1.10.2" \ No newline at end of file