Merge pull request #1502 from paulfantom/manifests

examples/kustomize.jsonnet

@@ -8,25 +8,22 @@ local kp =
   };
 
 local manifests =
-  // Uncomment line below to enable vertical auto scaling of kube-state-metrics
-  //{ ['ksm-autoscaler-' + name]: kp.ksmAutoscaler[name] for name in std.objectFields(kp.ksmAutoscaler) } +
-  { 'setup/0namespace-namespace': kp.kubePrometheus.namespace } +
   {
-    ['setup/prometheus-operator-' + name]: kp.prometheusOperator[name]
-    for name in std.filter((function(name) name != 'serviceMonitor' && name != 'prometheusRule'), std.objectFields(kp.prometheusOperator))
+    ['setup/' + resource]: kp[component][resource]
+    for component in std.objectFields(kp)
+    for resource in std.filter(
+      function(resource)
+        kp[component][resource].kind == 'CustomResourceDefinition' || kp[component][resource].kind == 'Namespace', std.objectFields(kp[component])
+    )
   } +
-  // serviceMonitor and prometheusRule are separated so that they can be created after the CRDs are ready
-  { 'prometheus-operator-serviceMonitor': kp.prometheusOperator.serviceMonitor } +
-  { 'prometheus-operator-prometheusRule': kp.prometheusOperator.prometheusRule } +
-  { 'kube-prometheus-prometheusRule': kp.kubePrometheus.prometheusRule } +
-  { ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } +
-  { ['blackbox-exporter-' + name]: kp.blackboxExporter[name] for name in std.objectFields(kp.blackboxExporter) } +
-  { ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } +
-  { ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } +
-  { ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } +
-  { ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } +
-  { ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } +
-  { ['kubernetes-' + name]: kp.kubernetesControlPlane[name] for name in std.objectFields(kp.kubernetesControlPlane) };
+  {
+    [component + '-' + resource]: kp[component][resource]
+    for component in std.objectFields(kp)
+    for resource in std.filter(
+      function(resource)
+        kp[component][resource].kind != 'CustomResourceDefinition' && kp[component][resource].kind != 'Namespace', std.objectFields(kp[component])
+    )
+  };
 
 local kustomizationResourceFile(name) = './manifests/' + name + '.yaml';
 local kustomization = {

kustomization.yaml

@@ -8,13 +8,13 @@ resources:
 - ./manifests/alertmanager-service.yaml
 - ./manifests/alertmanager-serviceAccount.yaml
 - ./manifests/alertmanager-serviceMonitor.yaml
-- ./manifests/blackbox-exporter-clusterRole.yaml
-- ./manifests/blackbox-exporter-clusterRoleBinding.yaml
-- ./manifests/blackbox-exporter-configuration.yaml
-- ./manifests/blackbox-exporter-deployment.yaml
-- ./manifests/blackbox-exporter-service.yaml
-- ./manifests/blackbox-exporter-serviceAccount.yaml
-- ./manifests/blackbox-exporter-serviceMonitor.yaml
+- ./manifests/blackboxExporter-clusterRole.yaml
+- ./manifests/blackboxExporter-clusterRoleBinding.yaml
+- ./manifests/blackboxExporter-configuration.yaml
+- ./manifests/blackboxExporter-deployment.yaml
+- ./manifests/blackboxExporter-service.yaml
+- ./manifests/blackboxExporter-serviceAccount.yaml
+- ./manifests/blackboxExporter-serviceMonitor.yaml
 - ./manifests/grafana-config.yaml
 - ./manifests/grafana-dashboardDatasources.yaml
 - ./manifests/grafana-dashboardDefinitions.yaml
@@ -23,44 +23,29 @@ resources:
 - ./manifests/grafana-service.yaml
 - ./manifests/grafana-serviceAccount.yaml
 - ./manifests/grafana-serviceMonitor.yaml
-- ./manifests/kube-prometheus-prometheusRule.yaml
-- ./manifests/kube-state-metrics-clusterRole.yaml
-- ./manifests/kube-state-metrics-clusterRoleBinding.yaml
-- ./manifests/kube-state-metrics-deployment.yaml
-- ./manifests/kube-state-metrics-prometheusRule.yaml
-- ./manifests/kube-state-metrics-service.yaml
-- ./manifests/kube-state-metrics-serviceAccount.yaml
-- ./manifests/kube-state-metrics-serviceMonitor.yaml
-- ./manifests/kubernetes-prometheusRule.yaml
-- ./manifests/kubernetes-serviceMonitorApiserver.yaml
-- ./manifests/kubernetes-serviceMonitorCoreDNS.yaml
-- ./manifests/kubernetes-serviceMonitorKubeControllerManager.yaml
-- ./manifests/kubernetes-serviceMonitorKubeScheduler.yaml
-- ./manifests/kubernetes-serviceMonitorKubelet.yaml
-- ./manifests/node-exporter-clusterRole.yaml
-- ./manifests/node-exporter-clusterRoleBinding.yaml
-- ./manifests/node-exporter-daemonset.yaml
-- ./manifests/node-exporter-prometheusRule.yaml
-- ./manifests/node-exporter-service.yaml
-- ./manifests/node-exporter-serviceAccount.yaml
-- ./manifests/node-exporter-serviceMonitor.yaml
-- ./manifests/prometheus-adapter-apiService.yaml
-- ./manifests/prometheus-adapter-clusterRole.yaml
-- ./manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml
-- ./manifests/prometheus-adapter-clusterRoleBinding.yaml
-- ./manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml
-- ./manifests/prometheus-adapter-clusterRoleServerResources.yaml
-- ./manifests/prometheus-adapter-configMap.yaml
-- ./manifests/prometheus-adapter-deployment.yaml
-- ./manifests/prometheus-adapter-podDisruptionBudget.yaml
-- ./manifests/prometheus-adapter-roleBindingAuthReader.yaml
-- ./manifests/prometheus-adapter-service.yaml
-- ./manifests/prometheus-adapter-serviceAccount.yaml
-- ./manifests/prometheus-adapter-serviceMonitor.yaml
+- ./manifests/kubePrometheus-prometheusRule.yaml
+- ./manifests/kubeStateMetrics-clusterRole.yaml
+- ./manifests/kubeStateMetrics-clusterRoleBinding.yaml
+- ./manifests/kubeStateMetrics-deployment.yaml
+- ./manifests/kubeStateMetrics-prometheusRule.yaml
+- ./manifests/kubeStateMetrics-service.yaml
+- ./manifests/kubeStateMetrics-serviceAccount.yaml
+- ./manifests/kubeStateMetrics-serviceMonitor.yaml
+- ./manifests/kubernetesControlPlane-prometheusRule.yaml
+- ./manifests/kubernetesControlPlane-serviceMonitorApiserver.yaml
+- ./manifests/kubernetesControlPlane-serviceMonitorCoreDNS.yaml
+- ./manifests/kubernetesControlPlane-serviceMonitorKubeControllerManager.yaml
+- ./manifests/kubernetesControlPlane-serviceMonitorKubeScheduler.yaml
+- ./manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
+- ./manifests/nodeExporter-clusterRole.yaml
+- ./manifests/nodeExporter-clusterRoleBinding.yaml
+- ./manifests/nodeExporter-daemonset.yaml
+- ./manifests/nodeExporter-prometheusRule.yaml
+- ./manifests/nodeExporter-service.yaml
+- ./manifests/nodeExporter-serviceAccount.yaml
+- ./manifests/nodeExporter-serviceMonitor.yaml
 - ./manifests/prometheus-clusterRole.yaml
 - ./manifests/prometheus-clusterRoleBinding.yaml
-- ./manifests/prometheus-operator-prometheusRule.yaml
-- ./manifests/prometheus-operator-serviceMonitor.yaml
 - ./manifests/prometheus-podDisruptionBudget.yaml
 - ./manifests/prometheus-prometheus.yaml
 - ./manifests/prometheus-prometheusRule.yaml
@@ -71,17 +56,32 @@ resources:
 - ./manifests/prometheus-service.yaml
 - ./manifests/prometheus-serviceAccount.yaml
 - ./manifests/prometheus-serviceMonitor.yaml
-- ./manifests/setup/0namespace-namespace.yaml
-- ./manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
-- ./manifests/setup/prometheus-operator-clusterRole.yaml
-- ./manifests/setup/prometheus-operator-clusterRoleBinding.yaml
-- ./manifests/setup/prometheus-operator-deployment.yaml
-- ./manifests/setup/prometheus-operator-service.yaml
-- ./manifests/setup/prometheus-operator-serviceAccount.yaml
+- ./manifests/prometheusAdapter-apiService.yaml
+- ./manifests/prometheusAdapter-clusterRole.yaml
+- ./manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
+- ./manifests/prometheusAdapter-clusterRoleBinding.yaml
+- ./manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
+- ./manifests/prometheusAdapter-clusterRoleServerResources.yaml
+- ./manifests/prometheusAdapter-configMap.yaml
+- ./manifests/prometheusAdapter-deployment.yaml
+- ./manifests/prometheusAdapter-podDisruptionBudget.yaml
+- ./manifests/prometheusAdapter-roleBindingAuthReader.yaml
+- ./manifests/prometheusAdapter-service.yaml
+- ./manifests/prometheusAdapter-serviceAccount.yaml
+- ./manifests/prometheusAdapter-serviceMonitor.yaml
+- ./manifests/prometheusOperator-clusterRole.yaml
+- ./manifests/prometheusOperator-clusterRoleBinding.yaml
+- ./manifests/prometheusOperator-deployment.yaml
+- ./manifests/prometheusOperator-prometheusRule.yaml
+- ./manifests/prometheusOperator-service.yaml
+- ./manifests/prometheusOperator-serviceAccount.yaml
+- ./manifests/prometheusOperator-serviceMonitor.yaml
+- ./manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+- ./manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+- ./manifests/setup/0podmonitorCustomResourceDefinition.yaml
+- ./manifests/setup/0probeCustomResourceDefinition.yaml
+- ./manifests/setup/0prometheusCustomResourceDefinition.yaml
+- ./manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+- ./manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+- ./manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+- ./manifests/setup/namespace.yaml