Move around configs, use map

Author: malcolmholmes

prometheus-ksonnet/lib/config.libsonnet

@@ -38,6 +38,7 @@
     prometheus_path: '/prometheus/',
     prometheus_port: 9090,
     prometheus_web_route_prefix: $._config.prometheus_path,
+    prometheus_config_file: '/etc/prometheus/prometheus.yml',
 
     // Alertmanager config options.
     alertmanager_external_hostname: 'http://alertmanager.%(namespace)s.svc.%(cluster_dns_suffix)s' % self,

prometheus-ksonnet/lib/prometheus.libsonnet

@@ -13,6 +13,7 @@
     name:: error 'must specify name',
 
     _config:: $._config,
+    local _config = self._config,
 
     local policyRule = $.rbac.v1beta1.policyRule,
 
@@ -30,29 +31,26 @@
 
     local container = $.core.v1.container,
 
-    prometheus_config_file:: '/etc/prometheus/prometheus.yml',
+    prometheus_args:: {
+        '--config.file': _config.prometheus_config_file,
+        '--web.listen-address': _config.prometheus_port,
+        '--web.external-url': '%(prometheus_external_hostname)s%(prometheus_path)s' % _config,
+        '--web.enable-admin-api': true,
+        '--web.enable-lifecycle': true,
+        '--web.route-prefix': _config.prometheus_web_route_prefix,
+        '--storage.tsdb.path': '/prometheus/data',
+        '--storage.tsdb.wal-compression': true,
+    },
 
     prometheus_container::
-      local _config = self._config;
 
       container.new('prometheus', $._images.prometheus) +
       container.withPorts($.core.v1.containerPort.new('http-metrics', _config.prometheus_port)) +
-      container.withArgs([
-        '--config.file=' + self.prometheus_config_file,
-        '--web.listen-address=:%s' % _config.prometheus_port,
-        '--web.external-url=%(prometheus_external_hostname)s%(prometheus_path)s' % _config,
-        '--web.enable-admin-api',
-        '--web.enable-lifecycle',
-        '--web.route-prefix=%s' % _config.prometheus_web_route_prefix,
-        '--storage.tsdb.path=/prometheus/data',
-        '--storage.tsdb.wal-compression',
-      ]) +
+      container.withArgs($.util.mapToArgs(self.prometheus_args) +
       $.util.resourcesRequests('250m', '1536Mi') +
       $.util.resourcesLimits('500m', '2Gi'),
 
     prometheus_watch_container::
-      local _config = self._config;
-
       container.new('watch', $._images.watch) +
       container.withArgs([
         '-v',
@@ -83,8 +81,6 @@
       $.util.configVolumeMount('%s-config' % self.name, '/etc/prometheus'),
 
     prometheus_statefulset:
-      local _config = self._config;
-
       statefulset.new(self.name, 1, [
         self.prometheus_container + container.withVolumeMountsMixin(
           volumeMount.new('%s-data' % self.name, '/prometheus')
@@ -106,8 +102,6 @@
     local servicePort = service.mixin.spec.portsType,
 
     prometheus_service:
-      local _config = self._config;
-
       $.util.serviceFor(self.prometheus_statefulset) +
       service.mixin.spec.withPortsMixin([
         servicePort.newNamed(