From 7a01cc94b635f162e4c45049e29b5665ae7f3b57 Mon Sep 17 00:00:00 2001 From: Raffael H Date: Thu, 10 Aug 2023 15:29:04 +0200 Subject: [PATCH] Add separators to named templates --- charts/user-monitoring/Chart.yaml | 2 +- charts/user-monitoring/templates/_user-am.yaml | 2 +- charts/user-monitoring/templates/_user-blackboxexporter-cm.yaml | 1 + .../templates/_user-blackboxexporter-deploy.yaml | 1 + charts/user-monitoring/templates/_user-grafana-cm.yaml | 1 + .../templates/_user-grafana-datasource-secret.yaml | 1 + charts/user-monitoring/templates/_user-grafana-deploy.yaml | 1 + charts/user-monitoring/templates/_user-grafana-ingress.yaml | 1 + charts/user-monitoring/templates/_user-grafana-rolebinding.yaml | 1 + charts/user-monitoring/templates/_user-grafana-sa.yaml | 1 + charts/user-monitoring/templates/_user-grafana-svc.yaml | 1 + charts/user-monitoring/templates/_user-prom-ingress.yaml | 1 + charts/user-monitoring/templates/_user-prom-role.yaml | 1 + charts/user-monitoring/templates/_user-prom-rolebinding.yaml | 1 + charts/user-monitoring/templates/_user-prom-sa.yaml | 1 + charts/user-monitoring/templates/_user-prometheus.yaml | 1 + charts/user-monitoring/templates/_user-pushgateway-deploy.yaml | 1 + .../templates/_user-pushgateway-servicemonitor.yaml | 1 + charts/user-monitoring/templates/_user-pushgateway-svc.yaml | 1 + charts/user-monitoring/templates/_user-thanos-query-deploy.yaml | 1 + .../user-monitoring/templates/_user-thanos-query-ingress.yaml | 1 + charts/user-monitoring/templates/_user-thanos-query-svc.yaml | 1 + charts/user-monitoring/templates/_user-thanosruler-ingress.yaml | 1 + charts/user-monitoring/templates/_user-thanosruler.yaml | 1 + 24 files changed, 24 insertions(+), 2 deletions(-) diff --git a/charts/user-monitoring/Chart.yaml b/charts/user-monitoring/Chart.yaml index bbadbc1..e9e335a 100644 --- a/charts/user-monitoring/Chart.yaml +++ b/charts/user-monitoring/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.2.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/user-monitoring/templates/_user-am.yaml b/charts/user-monitoring/templates/_user-am.yaml index ea963ec..93b8c5a 100644 --- a/charts/user-monitoring/templates/_user-am.yaml +++ b/charts/user-monitoring/templates/_user-am.yaml @@ -1,5 +1,5 @@ {{- define "alertmanager.alertmanager" }} - +--- apiVersion: monitoring.coreos.com/v1 kind: Alertmanager metadata: diff --git a/charts/user-monitoring/templates/_user-blackboxexporter-cm.yaml b/charts/user-monitoring/templates/_user-blackboxexporter-cm.yaml index 5e3d111..10f36e7 100644 --- a/charts/user-monitoring/templates/_user-blackboxexporter-cm.yaml +++ b/charts/user-monitoring/templates/_user-blackboxexporter-cm.yaml @@ -1,4 +1,5 @@ {{- define "blackboxexporter.cm" }} +--- apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/user-monitoring/templates/_user-blackboxexporter-deploy.yaml b/charts/user-monitoring/templates/_user-blackboxexporter-deploy.yaml index d94b931..4e34623 100644 --- a/charts/user-monitoring/templates/_user-blackboxexporter-deploy.yaml +++ b/charts/user-monitoring/templates/_user-blackboxexporter-deploy.yaml @@ -1,4 +1,5 @@ {{- define "blackboxexporter.deploy" }} +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/user-monitoring/templates/_user-grafana-cm.yaml b/charts/user-monitoring/templates/_user-grafana-cm.yaml index 7d5da93..8360d89 100644 --- a/charts/user-monitoring/templates/_user-grafana-cm.yaml +++ b/charts/user-monitoring/templates/_user-grafana-cm.yaml @@ -1,4 +1,5 @@ {{- define "grafana.dashboardprovider" }} +--- kind: ConfigMap apiVersion: v1 metadata: diff --git a/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml b/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml index 103433f..d722308 100644 --- a/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml +++ b/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml @@ -1,4 +1,5 @@ {{- define "grafana.datasource" }} +--- apiVersion: v1 kind: Secret type: Opaque diff --git a/charts/user-monitoring/templates/_user-grafana-deploy.yaml b/charts/user-monitoring/templates/_user-grafana-deploy.yaml index 1f86203..1b6d1f9 100644 --- a/charts/user-monitoring/templates/_user-grafana-deploy.yaml +++ b/charts/user-monitoring/templates/_user-grafana-deploy.yaml @@ -1,4 +1,5 @@ {{- define "grafana.deploy" }} +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/user-monitoring/templates/_user-grafana-ingress.yaml b/charts/user-monitoring/templates/_user-grafana-ingress.yaml index d361f00..66c52d1 100644 --- a/charts/user-monitoring/templates/_user-grafana-ingress.yaml +++ b/charts/user-monitoring/templates/_user-grafana-ingress.yaml @@ -1,4 +1,5 @@ {{- define "grafana.ingress" }} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/charts/user-monitoring/templates/_user-grafana-rolebinding.yaml b/charts/user-monitoring/templates/_user-grafana-rolebinding.yaml index 43612b2..29b3b35 100644 --- a/charts/user-monitoring/templates/_user-grafana-rolebinding.yaml +++ b/charts/user-monitoring/templates/_user-grafana-rolebinding.yaml @@ -1,4 +1,5 @@ {{- define "grafana.rolebinding" }} +--- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: diff --git a/charts/user-monitoring/templates/_user-grafana-sa.yaml b/charts/user-monitoring/templates/_user-grafana-sa.yaml index 54ce82d..b36774e 100644 --- a/charts/user-monitoring/templates/_user-grafana-sa.yaml +++ b/charts/user-monitoring/templates/_user-grafana-sa.yaml @@ -1,4 +1,5 @@ {{- define "grafana.sa" }} +--- apiVersion: v1 kind: ServiceAccount metadata: diff --git a/charts/user-monitoring/templates/_user-grafana-svc.yaml b/charts/user-monitoring/templates/_user-grafana-svc.yaml index 043dd29..387dc55 100644 --- a/charts/user-monitoring/templates/_user-grafana-svc.yaml +++ b/charts/user-monitoring/templates/_user-grafana-svc.yaml @@ -1,4 +1,5 @@ {{- define "grafana.svc" }} +--- apiVersion: v1 kind: Service metadata: diff --git a/charts/user-monitoring/templates/_user-prom-ingress.yaml b/charts/user-monitoring/templates/_user-prom-ingress.yaml index c9d1548..ecac719 100644 --- a/charts/user-monitoring/templates/_user-prom-ingress.yaml +++ b/charts/user-monitoring/templates/_user-prom-ingress.yaml @@ -1,4 +1,5 @@ {{- define "prometheus.ingress" }} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/charts/user-monitoring/templates/_user-prom-role.yaml b/charts/user-monitoring/templates/_user-prom-role.yaml index 7c80785..e8c7981 100644 --- a/charts/user-monitoring/templates/_user-prom-role.yaml +++ b/charts/user-monitoring/templates/_user-prom-role.yaml @@ -1,4 +1,5 @@ {{- define "prometheus.role" }} +--- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: diff --git a/charts/user-monitoring/templates/_user-prom-rolebinding.yaml b/charts/user-monitoring/templates/_user-prom-rolebinding.yaml index dbba82e..a0e0fec 100644 --- a/charts/user-monitoring/templates/_user-prom-rolebinding.yaml +++ b/charts/user-monitoring/templates/_user-prom-rolebinding.yaml @@ -1,4 +1,5 @@ {{- define "prometheus.rolebinding" }} +--- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: diff --git a/charts/user-monitoring/templates/_user-prom-sa.yaml b/charts/user-monitoring/templates/_user-prom-sa.yaml index 65dfa44..9e478e8 100644 --- a/charts/user-monitoring/templates/_user-prom-sa.yaml +++ b/charts/user-monitoring/templates/_user-prom-sa.yaml @@ -1,4 +1,5 @@ {{- define "prometheus.sa" }} +--- apiVersion: v1 kind: ServiceAccount metadata: diff --git a/charts/user-monitoring/templates/_user-prometheus.yaml b/charts/user-monitoring/templates/_user-prometheus.yaml index 6e518f3..2d4be3b 100644 --- a/charts/user-monitoring/templates/_user-prometheus.yaml +++ b/charts/user-monitoring/templates/_user-prometheus.yaml @@ -1,4 +1,5 @@ {{- define "prometheus.prometheus" }} +--- apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: diff --git a/charts/user-monitoring/templates/_user-pushgateway-deploy.yaml b/charts/user-monitoring/templates/_user-pushgateway-deploy.yaml index 4e07ffd..d340a51 100644 --- a/charts/user-monitoring/templates/_user-pushgateway-deploy.yaml +++ b/charts/user-monitoring/templates/_user-pushgateway-deploy.yaml @@ -1,4 +1,5 @@ {{- define "pushgateway.deploy" }} +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/user-monitoring/templates/_user-pushgateway-servicemonitor.yaml b/charts/user-monitoring/templates/_user-pushgateway-servicemonitor.yaml index 0239896..36d730d 100644 --- a/charts/user-monitoring/templates/_user-pushgateway-servicemonitor.yaml +++ b/charts/user-monitoring/templates/_user-pushgateway-servicemonitor.yaml @@ -1,4 +1,5 @@ {{- define "pushgateway.servicemonitor" }} +--- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/user-monitoring/templates/_user-pushgateway-svc.yaml b/charts/user-monitoring/templates/_user-pushgateway-svc.yaml index 00eff61..16d33ff 100644 --- a/charts/user-monitoring/templates/_user-pushgateway-svc.yaml +++ b/charts/user-monitoring/templates/_user-pushgateway-svc.yaml @@ -1,4 +1,5 @@ {{- define "pushgateway.svc" }} +--- apiVersion: v1 kind: Service metadata: diff --git a/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml b/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml index 3c72e4f..4af341e 100644 --- a/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml +++ b/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml @@ -1,4 +1,5 @@ {{- define "query.deploy" }} +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/user-monitoring/templates/_user-thanos-query-ingress.yaml b/charts/user-monitoring/templates/_user-thanos-query-ingress.yaml index bbf8db4..ee79567 100644 --- a/charts/user-monitoring/templates/_user-thanos-query-ingress.yaml +++ b/charts/user-monitoring/templates/_user-thanos-query-ingress.yaml @@ -1,4 +1,5 @@ {{- define "query.ingress" }} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/charts/user-monitoring/templates/_user-thanos-query-svc.yaml b/charts/user-monitoring/templates/_user-thanos-query-svc.yaml index 6698a30..2d8b0fb 100644 --- a/charts/user-monitoring/templates/_user-thanos-query-svc.yaml +++ b/charts/user-monitoring/templates/_user-thanos-query-svc.yaml @@ -1,4 +1,5 @@ {{- define "query.svc" }} +--- apiVersion: v1 kind: Service metadata: diff --git a/charts/user-monitoring/templates/_user-thanosruler-ingress.yaml b/charts/user-monitoring/templates/_user-thanosruler-ingress.yaml index cdc4737..e650f82 100644 --- a/charts/user-monitoring/templates/_user-thanosruler-ingress.yaml +++ b/charts/user-monitoring/templates/_user-thanosruler-ingress.yaml @@ -1,4 +1,5 @@ {{- define "ruler.ingress" }} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/charts/user-monitoring/templates/_user-thanosruler.yaml b/charts/user-monitoring/templates/_user-thanosruler.yaml index 74c3623..360b5a8 100644 --- a/charts/user-monitoring/templates/_user-thanosruler.yaml +++ b/charts/user-monitoring/templates/_user-thanosruler.yaml @@ -1,4 +1,5 @@ {{- define "ruler.ruler" }} +--- apiVersion: monitoring.coreos.com/v1 kind: ThanosRuler metadata: