diff --git a/examples/etcd-skip-verify.jsonnet b/examples/etcd-skip-verify.jsonnet new file mode 100644 index 0000000000000000000000000000000000000000..603ba710e48a5cefd0c2c80df0796fb2e5ce5484 --- /dev/null +++ b/examples/etcd-skip-verify.jsonnet @@ -0,0 +1,22 @@ +local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + + (import 'kube-prometheus/kube-prometheus-static-etcd.libsonnet') + { + _config+:: { + namespace: 'monitoring', + + etcd+:: { + ips: ['127.0.0.1'], + clientCA: importstr 'etcd-client-ca.crt', + clientKey: importstr 'etcd-client.key', + clientCert: importstr 'etcd-client.crt', + insecureSkipVerify: true, + }, + }, +}; + +{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + +{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } + +{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + +{ ['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) } + +{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } diff --git a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet index 23883c2c5f14a426f98c2fc10d7509582fc83b4f..d63b8680d0a9cc5aba2c626cf8e62982f28a5541 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet @@ -8,6 +8,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; clientKey: null, clientCert: null, serverName: null, + insecureSkipVerify: null, }, }, prometheus+:: { @@ -65,7 +66,8 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; caFile: '/etc/prometheus/secrets/kube-etcd-client-certs/etcd-client-ca.crt', keyFile: '/etc/prometheus/secrets/kube-etcd-client-certs/etcd-client.key', certFile: '/etc/prometheus/secrets/kube-etcd-client-certs/etcd-client.crt', - serverName: $._config.etcd.serverName, + [if $._config.etcd.serverName != null then 'serverName']: $._config.etcd.serverName, + [if $._config.etcd.insecureSkipVerify != null then 'insecureSkipVerify']: $._config.etcd.insecureSkipVerify, }, }, ], diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 5951577ceb2974c35253b5b34fbb09ae526c49a9..0001fe4b0725f4b3c41eee769e2e3cc60cf1ae0c 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" } }, - "version": "793d90134afffc41c07d0482794379962f3e14ec" + "version": "18d040769c2128c292330915d60f267e0d4bb325" }, { "name": "ksonnet", @@ -78,7 +78,7 @@ "subdir": "Documentation/etcd-mixin" } }, - "version": "6c9a853f04f8e0cde6139f3a9d04d00517407b91" + "version": "f87b566248bb0713a56dc55bc545aa5aad17ace0" } ] } \ No newline at end of file