From 375990eecdc86042eaece50447f8c2deeee8cd33 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Tue, 21 Jul 2020 13:11:14 +0300 Subject: [PATCH] [stable/prometheus] Organized Templates Directory. Add ".gitignore". (#23186) * organized templates dir Signed-off-by: Xtigyro * shorten the filenames Signed-off-by: Xtigyro * bump chart version again Signed-off-by: Xtigyro --- charts/prometheus/.gitignore | 2 ++ charts/prometheus/Chart.yaml | 2 +- .../alertmanager.yaml} | 0 .../templates/{server-configmap.yaml => configmaps/server.yaml} | 0 .../node-exporter.yaml} | 0 .../alertmanager.yaml} | 0 .../pushgateway.yaml} | 0 .../{server-deployment.yaml => deployments/server.yaml} | 0 .../{alertmanager-ingress.yaml => ingresses/alertmanager.yaml} | 0 .../{pushgateway-ingress.yaml => ingresses/pushgateway.yaml} | 0 .../templates/{server-ingress.yaml => ingresses/server.yaml} | 0 .../alertmanager.yaml} | 0 .../pushgateway.yaml} | 0 .../{server-networkpolicy.yaml => networkpolicies/server.yaml} | 0 .../alertmanager.yaml} | 0 .../pushgateway.yaml} | 0 .../{server-pvc.yaml => persistentvolumeclaims/server.yaml} | 0 .../alertmanager.yaml} | 0 .../pushgateway.yaml} | 0 .../{server-pdb.yaml => poddisruptionbudgets/server.yaml} | 0 .../alertmanager.yaml} | 0 .../node-exporter.yaml} | 0 .../pushgateway.yaml} | 0 .../server.yaml} | 0 .../templates/{ => rbac}/alertmanager-clusterrole.yaml | 0 .../templates/{ => rbac}/alertmanager-clusterrolebinding.yaml | 0 charts/prometheus/templates/{ => rbac}/alertmanager-role.yaml | 0 .../templates/{ => rbac}/alertmanager-rolebinding.yaml | 0 .../templates/{ => rbac}/alertmanager-serviceaccount.yaml | 0 charts/prometheus/templates/{ => rbac}/node-exporter-role.yaml | 0 .../templates/{ => rbac}/node-exporter-rolebinding.yaml | 0 .../templates/{ => rbac}/node-exporter-serviceaccount.yaml | 0 .../templates/{ => rbac}/pushgateway-clusterrole.yaml | 0 .../templates/{ => rbac}/pushgateway-clusterrolebinding.yaml | 0 .../templates/{ => rbac}/pushgateway-serviceaccount.yaml | 0 charts/prometheus/templates/{ => rbac}/server-clusterrole.yaml | 0 .../templates/{ => rbac}/server-clusterrolebinding.yaml | 0 charts/prometheus/templates/{ => rbac}/server-rolebinding.yaml | 0 .../prometheus/templates/{ => rbac}/server-serviceaccount.yaml | 0 .../alertmanager-headless.yaml} | 0 .../{alertmanager-service.yaml => services/alertmanager.yaml} | 0 .../{node-exporter-service.yaml => services/node-exporter.yaml} | 0 .../{pushgateway-service.yaml => services/pushgateway.yaml} | 0 .../server-headless.yaml} | 0 .../templates/{server-service.yaml => services/server.yaml} | 0 .../alertmanager.yaml} | 0 .../{server-statefulset.yaml => statefulsets/server.yaml} | 0 .../{server-vpa.yaml => verticalpodautoscalers/server.yaml} | 0 48 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 charts/prometheus/.gitignore rename charts/prometheus/templates/{alertmanager-configmap.yaml => configmaps/alertmanager.yaml} (100%) rename charts/prometheus/templates/{server-configmap.yaml => configmaps/server.yaml} (100%) rename charts/prometheus/templates/{node-exporter-daemonset.yaml => daemonsets/node-exporter.yaml} (100%) rename charts/prometheus/templates/{alertmanager-deployment.yaml => deployments/alertmanager.yaml} (100%) rename charts/prometheus/templates/{pushgateway-deployment.yaml => deployments/pushgateway.yaml} (100%) rename charts/prometheus/templates/{server-deployment.yaml => deployments/server.yaml} (100%) rename charts/prometheus/templates/{alertmanager-ingress.yaml => ingresses/alertmanager.yaml} (100%) rename charts/prometheus/templates/{pushgateway-ingress.yaml => ingresses/pushgateway.yaml} (100%) rename charts/prometheus/templates/{server-ingress.yaml => ingresses/server.yaml} (100%) rename charts/prometheus/templates/{alertmanager-networkpolicy.yaml => networkpolicies/alertmanager.yaml} (100%) rename charts/prometheus/templates/{pushgateway-networkpolicy.yaml => networkpolicies/pushgateway.yaml} (100%) rename charts/prometheus/templates/{server-networkpolicy.yaml => networkpolicies/server.yaml} (100%) rename charts/prometheus/templates/{alertmanager-pvc.yaml => persistentvolumeclaims/alertmanager.yaml} (100%) rename charts/prometheus/templates/{pushgateway-pvc.yaml => persistentvolumeclaims/pushgateway.yaml} (100%) rename charts/prometheus/templates/{server-pvc.yaml => persistentvolumeclaims/server.yaml} (100%) rename charts/prometheus/templates/{alertmanager-pdb.yaml => poddisruptionbudgets/alertmanager.yaml} (100%) rename charts/prometheus/templates/{pushgateway-pdb.yaml => poddisruptionbudgets/pushgateway.yaml} (100%) rename charts/prometheus/templates/{server-pdb.yaml => poddisruptionbudgets/server.yaml} (100%) rename charts/prometheus/templates/{alertmanager-podsecuritypolicy.yaml => podsecuritypolicies/alertmanager.yaml} (100%) rename charts/prometheus/templates/{node-exporter-podsecuritypolicy.yaml => podsecuritypolicies/node-exporter.yaml} (100%) rename charts/prometheus/templates/{pushgateway-podsecuritypolicy.yaml => podsecuritypolicies/pushgateway.yaml} (100%) rename charts/prometheus/templates/{server-podsecuritypolicy.yaml => podsecuritypolicies/server.yaml} (100%) rename charts/prometheus/templates/{ => rbac}/alertmanager-clusterrole.yaml (100%) rename charts/prometheus/templates/{ => rbac}/alertmanager-clusterrolebinding.yaml (100%) rename charts/prometheus/templates/{ => rbac}/alertmanager-role.yaml (100%) rename charts/prometheus/templates/{ => rbac}/alertmanager-rolebinding.yaml (100%) rename charts/prometheus/templates/{ => rbac}/alertmanager-serviceaccount.yaml (100%) rename charts/prometheus/templates/{ => rbac}/node-exporter-role.yaml (100%) rename charts/prometheus/templates/{ => rbac}/node-exporter-rolebinding.yaml (100%) rename charts/prometheus/templates/{ => rbac}/node-exporter-serviceaccount.yaml (100%) rename charts/prometheus/templates/{ => rbac}/pushgateway-clusterrole.yaml (100%) rename charts/prometheus/templates/{ => rbac}/pushgateway-clusterrolebinding.yaml (100%) rename charts/prometheus/templates/{ => rbac}/pushgateway-serviceaccount.yaml (100%) rename charts/prometheus/templates/{ => rbac}/server-clusterrole.yaml (100%) rename charts/prometheus/templates/{ => rbac}/server-clusterrolebinding.yaml (100%) rename charts/prometheus/templates/{ => rbac}/server-rolebinding.yaml (100%) rename charts/prometheus/templates/{ => rbac}/server-serviceaccount.yaml (100%) rename charts/prometheus/templates/{alertmanager-service-headless.yaml => services/alertmanager-headless.yaml} (100%) rename charts/prometheus/templates/{alertmanager-service.yaml => services/alertmanager.yaml} (100%) rename charts/prometheus/templates/{node-exporter-service.yaml => services/node-exporter.yaml} (100%) rename charts/prometheus/templates/{pushgateway-service.yaml => services/pushgateway.yaml} (100%) rename charts/prometheus/templates/{server-service-headless.yaml => services/server-headless.yaml} (100%) rename charts/prometheus/templates/{server-service.yaml => services/server.yaml} (100%) rename charts/prometheus/templates/{alertmanager-statefulset.yaml => statefulsets/alertmanager.yaml} (100%) rename charts/prometheus/templates/{server-statefulset.yaml => statefulsets/server.yaml} (100%) rename charts/prometheus/templates/{server-vpa.yaml => verticalpodautoscalers/server.yaml} (100%) diff --git a/charts/prometheus/.gitignore b/charts/prometheus/.gitignore new file mode 100644 index 00000000..371ee506 --- /dev/null +++ b/charts/prometheus/.gitignore @@ -0,0 +1,2 @@ +requirements.lock + diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index cf82c297..634ce1a7 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.8.0 +version: 11.9.0 appVersion: 2.19.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/charts/prometheus/templates/alertmanager-configmap.yaml b/charts/prometheus/templates/configmaps/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-configmap.yaml rename to charts/prometheus/templates/configmaps/alertmanager.yaml diff --git a/charts/prometheus/templates/server-configmap.yaml b/charts/prometheus/templates/configmaps/server.yaml similarity index 100% rename from charts/prometheus/templates/server-configmap.yaml rename to charts/prometheus/templates/configmaps/server.yaml diff --git a/charts/prometheus/templates/node-exporter-daemonset.yaml b/charts/prometheus/templates/daemonsets/node-exporter.yaml similarity index 100% rename from charts/prometheus/templates/node-exporter-daemonset.yaml rename to charts/prometheus/templates/daemonsets/node-exporter.yaml diff --git a/charts/prometheus/templates/alertmanager-deployment.yaml b/charts/prometheus/templates/deployments/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-deployment.yaml rename to charts/prometheus/templates/deployments/alertmanager.yaml diff --git a/charts/prometheus/templates/pushgateway-deployment.yaml b/charts/prometheus/templates/deployments/pushgateway.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-deployment.yaml rename to charts/prometheus/templates/deployments/pushgateway.yaml diff --git a/charts/prometheus/templates/server-deployment.yaml b/charts/prometheus/templates/deployments/server.yaml similarity index 100% rename from charts/prometheus/templates/server-deployment.yaml rename to charts/prometheus/templates/deployments/server.yaml diff --git a/charts/prometheus/templates/alertmanager-ingress.yaml b/charts/prometheus/templates/ingresses/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-ingress.yaml rename to charts/prometheus/templates/ingresses/alertmanager.yaml diff --git a/charts/prometheus/templates/pushgateway-ingress.yaml b/charts/prometheus/templates/ingresses/pushgateway.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-ingress.yaml rename to charts/prometheus/templates/ingresses/pushgateway.yaml diff --git a/charts/prometheus/templates/server-ingress.yaml b/charts/prometheus/templates/ingresses/server.yaml similarity index 100% rename from charts/prometheus/templates/server-ingress.yaml rename to charts/prometheus/templates/ingresses/server.yaml diff --git a/charts/prometheus/templates/alertmanager-networkpolicy.yaml b/charts/prometheus/templates/networkpolicies/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-networkpolicy.yaml rename to charts/prometheus/templates/networkpolicies/alertmanager.yaml diff --git a/charts/prometheus/templates/pushgateway-networkpolicy.yaml b/charts/prometheus/templates/networkpolicies/pushgateway.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-networkpolicy.yaml rename to charts/prometheus/templates/networkpolicies/pushgateway.yaml diff --git a/charts/prometheus/templates/server-networkpolicy.yaml b/charts/prometheus/templates/networkpolicies/server.yaml similarity index 100% rename from charts/prometheus/templates/server-networkpolicy.yaml rename to charts/prometheus/templates/networkpolicies/server.yaml diff --git a/charts/prometheus/templates/alertmanager-pvc.yaml b/charts/prometheus/templates/persistentvolumeclaims/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-pvc.yaml rename to charts/prometheus/templates/persistentvolumeclaims/alertmanager.yaml diff --git a/charts/prometheus/templates/pushgateway-pvc.yaml b/charts/prometheus/templates/persistentvolumeclaims/pushgateway.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-pvc.yaml rename to charts/prometheus/templates/persistentvolumeclaims/pushgateway.yaml diff --git a/charts/prometheus/templates/server-pvc.yaml b/charts/prometheus/templates/persistentvolumeclaims/server.yaml similarity index 100% rename from charts/prometheus/templates/server-pvc.yaml rename to charts/prometheus/templates/persistentvolumeclaims/server.yaml diff --git a/charts/prometheus/templates/alertmanager-pdb.yaml b/charts/prometheus/templates/poddisruptionbudgets/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-pdb.yaml rename to charts/prometheus/templates/poddisruptionbudgets/alertmanager.yaml diff --git a/charts/prometheus/templates/pushgateway-pdb.yaml b/charts/prometheus/templates/poddisruptionbudgets/pushgateway.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-pdb.yaml rename to charts/prometheus/templates/poddisruptionbudgets/pushgateway.yaml diff --git a/charts/prometheus/templates/server-pdb.yaml b/charts/prometheus/templates/poddisruptionbudgets/server.yaml similarity index 100% rename from charts/prometheus/templates/server-pdb.yaml rename to charts/prometheus/templates/poddisruptionbudgets/server.yaml diff --git a/charts/prometheus/templates/alertmanager-podsecuritypolicy.yaml b/charts/prometheus/templates/podsecuritypolicies/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-podsecuritypolicy.yaml rename to charts/prometheus/templates/podsecuritypolicies/alertmanager.yaml diff --git a/charts/prometheus/templates/node-exporter-podsecuritypolicy.yaml b/charts/prometheus/templates/podsecuritypolicies/node-exporter.yaml similarity index 100% rename from charts/prometheus/templates/node-exporter-podsecuritypolicy.yaml rename to charts/prometheus/templates/podsecuritypolicies/node-exporter.yaml diff --git a/charts/prometheus/templates/pushgateway-podsecuritypolicy.yaml b/charts/prometheus/templates/podsecuritypolicies/pushgateway.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-podsecuritypolicy.yaml rename to charts/prometheus/templates/podsecuritypolicies/pushgateway.yaml diff --git a/charts/prometheus/templates/server-podsecuritypolicy.yaml b/charts/prometheus/templates/podsecuritypolicies/server.yaml similarity index 100% rename from charts/prometheus/templates/server-podsecuritypolicy.yaml rename to charts/prometheus/templates/podsecuritypolicies/server.yaml diff --git a/charts/prometheus/templates/alertmanager-clusterrole.yaml b/charts/prometheus/templates/rbac/alertmanager-clusterrole.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-clusterrole.yaml rename to charts/prometheus/templates/rbac/alertmanager-clusterrole.yaml diff --git a/charts/prometheus/templates/alertmanager-clusterrolebinding.yaml b/charts/prometheus/templates/rbac/alertmanager-clusterrolebinding.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-clusterrolebinding.yaml rename to charts/prometheus/templates/rbac/alertmanager-clusterrolebinding.yaml diff --git a/charts/prometheus/templates/alertmanager-role.yaml b/charts/prometheus/templates/rbac/alertmanager-role.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-role.yaml rename to charts/prometheus/templates/rbac/alertmanager-role.yaml diff --git a/charts/prometheus/templates/alertmanager-rolebinding.yaml b/charts/prometheus/templates/rbac/alertmanager-rolebinding.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-rolebinding.yaml rename to charts/prometheus/templates/rbac/alertmanager-rolebinding.yaml diff --git a/charts/prometheus/templates/alertmanager-serviceaccount.yaml b/charts/prometheus/templates/rbac/alertmanager-serviceaccount.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-serviceaccount.yaml rename to charts/prometheus/templates/rbac/alertmanager-serviceaccount.yaml diff --git a/charts/prometheus/templates/node-exporter-role.yaml b/charts/prometheus/templates/rbac/node-exporter-role.yaml similarity index 100% rename from charts/prometheus/templates/node-exporter-role.yaml rename to charts/prometheus/templates/rbac/node-exporter-role.yaml diff --git a/charts/prometheus/templates/node-exporter-rolebinding.yaml b/charts/prometheus/templates/rbac/node-exporter-rolebinding.yaml similarity index 100% rename from charts/prometheus/templates/node-exporter-rolebinding.yaml rename to charts/prometheus/templates/rbac/node-exporter-rolebinding.yaml diff --git a/charts/prometheus/templates/node-exporter-serviceaccount.yaml b/charts/prometheus/templates/rbac/node-exporter-serviceaccount.yaml similarity index 100% rename from charts/prometheus/templates/node-exporter-serviceaccount.yaml rename to charts/prometheus/templates/rbac/node-exporter-serviceaccount.yaml diff --git a/charts/prometheus/templates/pushgateway-clusterrole.yaml b/charts/prometheus/templates/rbac/pushgateway-clusterrole.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-clusterrole.yaml rename to charts/prometheus/templates/rbac/pushgateway-clusterrole.yaml diff --git a/charts/prometheus/templates/pushgateway-clusterrolebinding.yaml b/charts/prometheus/templates/rbac/pushgateway-clusterrolebinding.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-clusterrolebinding.yaml rename to charts/prometheus/templates/rbac/pushgateway-clusterrolebinding.yaml diff --git a/charts/prometheus/templates/pushgateway-serviceaccount.yaml b/charts/prometheus/templates/rbac/pushgateway-serviceaccount.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-serviceaccount.yaml rename to charts/prometheus/templates/rbac/pushgateway-serviceaccount.yaml diff --git a/charts/prometheus/templates/server-clusterrole.yaml b/charts/prometheus/templates/rbac/server-clusterrole.yaml similarity index 100% rename from charts/prometheus/templates/server-clusterrole.yaml rename to charts/prometheus/templates/rbac/server-clusterrole.yaml diff --git a/charts/prometheus/templates/server-clusterrolebinding.yaml b/charts/prometheus/templates/rbac/server-clusterrolebinding.yaml similarity index 100% rename from charts/prometheus/templates/server-clusterrolebinding.yaml rename to charts/prometheus/templates/rbac/server-clusterrolebinding.yaml diff --git a/charts/prometheus/templates/server-rolebinding.yaml b/charts/prometheus/templates/rbac/server-rolebinding.yaml similarity index 100% rename from charts/prometheus/templates/server-rolebinding.yaml rename to charts/prometheus/templates/rbac/server-rolebinding.yaml diff --git a/charts/prometheus/templates/server-serviceaccount.yaml b/charts/prometheus/templates/rbac/server-serviceaccount.yaml similarity index 100% rename from charts/prometheus/templates/server-serviceaccount.yaml rename to charts/prometheus/templates/rbac/server-serviceaccount.yaml diff --git a/charts/prometheus/templates/alertmanager-service-headless.yaml b/charts/prometheus/templates/services/alertmanager-headless.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-service-headless.yaml rename to charts/prometheus/templates/services/alertmanager-headless.yaml diff --git a/charts/prometheus/templates/alertmanager-service.yaml b/charts/prometheus/templates/services/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-service.yaml rename to charts/prometheus/templates/services/alertmanager.yaml diff --git a/charts/prometheus/templates/node-exporter-service.yaml b/charts/prometheus/templates/services/node-exporter.yaml similarity index 100% rename from charts/prometheus/templates/node-exporter-service.yaml rename to charts/prometheus/templates/services/node-exporter.yaml diff --git a/charts/prometheus/templates/pushgateway-service.yaml b/charts/prometheus/templates/services/pushgateway.yaml similarity index 100% rename from charts/prometheus/templates/pushgateway-service.yaml rename to charts/prometheus/templates/services/pushgateway.yaml diff --git a/charts/prometheus/templates/server-service-headless.yaml b/charts/prometheus/templates/services/server-headless.yaml similarity index 100% rename from charts/prometheus/templates/server-service-headless.yaml rename to charts/prometheus/templates/services/server-headless.yaml diff --git a/charts/prometheus/templates/server-service.yaml b/charts/prometheus/templates/services/server.yaml similarity index 100% rename from charts/prometheus/templates/server-service.yaml rename to charts/prometheus/templates/services/server.yaml diff --git a/charts/prometheus/templates/alertmanager-statefulset.yaml b/charts/prometheus/templates/statefulsets/alertmanager.yaml similarity index 100% rename from charts/prometheus/templates/alertmanager-statefulset.yaml rename to charts/prometheus/templates/statefulsets/alertmanager.yaml diff --git a/charts/prometheus/templates/server-statefulset.yaml b/charts/prometheus/templates/statefulsets/server.yaml similarity index 100% rename from charts/prometheus/templates/server-statefulset.yaml rename to charts/prometheus/templates/statefulsets/server.yaml diff --git a/charts/prometheus/templates/server-vpa.yaml b/charts/prometheus/templates/verticalpodautoscalers/server.yaml similarity index 100% rename from charts/prometheus/templates/server-vpa.yaml rename to charts/prometheus/templates/verticalpodautoscalers/server.yaml