Merge pull request #222 from m-lab/sandbox-pboothe

Eliminated a bunch of indirection.
m-lab · Jun 6, 2019 · ddc2bdf · ddc2bdf
2 parents 3532ee8 + 82964d0
commit ddc2bdf
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 50 deletions.
diff --git a/config/configmaps.jsonnet b/config/configmaps.jsonnet
diff --git a/k8s/custom-resource-definitions.jsonnet b/k8s/custom-resource-definitions.jsonnet
diff --git a/k8s/daemonsets.jsonnet b/k8s/daemonsets.jsonnet
diff --git a/k8s/daemonsets/core.jsonnet b/k8s/daemonsets/core.jsonnet
diff --git a/k8s/daemonsets/experiments.jsonnet b/k8s/daemonsets/experiments.jsonnet
diff --git a/k8s/deployments.jsonnet b/k8s/deployments.jsonnet
diff --git a/k8s/namespaces.jsonnet b/k8s/namespaces.jsonnet
diff --git a/k8s/networks.jsonnet b/k8s/networks.jsonnet
diff --git a/k8s/roles.jsonnet b/k8s/roles.jsonnet
diff --git a/system.jsonnet b/system.jsonnet
@@ -1,13 +1,40 @@
 {
   kind: 'List',
   apiVersion: 'v1',
-  items: std.flattenArrays([
-    import 'config/configmaps.jsonnet',
-    import 'k8s/custom-resource-definitions.jsonnet',
-    import 'k8s/daemonsets.jsonnet',
-    import 'k8s/deployments.jsonnet',
-    import 'k8s/namespaces.jsonnet',
-    import 'k8s/networks.jsonnet',
-    import 'k8s/roles.jsonnet',
+  items: [
+    // Configmaps
+    import 'config/flannel.jsonnet',
+    import 'config/fluentd.jsonnet',
+    import 'config/nodeinfo.jsonnet',
+    import 'config/prometheus.jsonnet',
+    import 'config/prometheus-synthetic-textfile-metrics.jsonnet',
+    import 'config/pusher.jsonnet',
+    // Custom resource definitions
+    import 'k8s/custom-resource-definitions/network-attachment-definition.jsonnet',
+    // Daemonsets
+    import 'k8s/daemonsets/core/cadvisor.jsonnet',
+    import 'k8s/daemonsets/core/flannel-cloud.jsonnet',
+    import 'k8s/daemonsets/core/flannel-platform.jsonnet',
+    import 'k8s/daemonsets/core/fluentd.jsonnet',
+    import 'k8s/daemonsets/core/host.jsonnet',
+    import 'k8s/daemonsets/core/node-exporter.jsonnet',
+    import 'k8s/daemonsets/core/update-agent.jsonnet',
+    import 'k8s/daemonsets/experiments/bismark.jsonnet',
+    import 'k8s/daemonsets/experiments/ndt.jsonnet',
+    // Deployments
+    import 'k8s/deployments/kube-state-metrics.jsonnet',
+    import 'k8s/deployments/prometheus.jsonnet',
+    import 'k8s/deployments/update-operator.jsonnet',
+    // Namespaces
+    import 'k8s/namespaces/reboot-operator.jsonnet',
+  ] + std.flattenArrays([
+    // Networks (which are in array form already).
+    import 'k8s/networks/networks.jsonnet',
+    // Roles (which are in array form already).
+    import 'k8s/roles/container-linux-update-coordinator.jsonnet',
+    import 'k8s/roles/flannel.jsonnet',
+    import 'k8s/roles/kube-rbac-proxy.jsonnet',
+    import 'k8s/roles/kube-state-metrics.jsonnet',
+    import 'k8s/roles/rbac-prometheus.jsonnet',
   ]),
 }