mirror of
https://github.com/prometheus-operator/kube-prometheus.git
synced 2025-11-02 09:01:02 +01:00
use top-level config for all nodeExporter selector labels
This commit is contained in:
parent
0d907098ae
commit
432db2c799
@ -20,6 +20,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
|
|||||||
'app.kubernetes.io/name': 'node-exporter',
|
'app.kubernetes.io/name': 'node-exporter',
|
||||||
'app.kubernetes.io/version': $._config.versions.nodeExporter,
|
'app.kubernetes.io/version': $._config.versions.nodeExporter,
|
||||||
},
|
},
|
||||||
|
selectorLabels: {
|
||||||
|
[labelName]: $._config.nodeExporter.labels[labelName]
|
||||||
|
for labelName in std.objectFields($._config.nodeExporter.labels)
|
||||||
|
if !std.setMember(labelName, ['app.kubernetes.io/version'])
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -69,11 +74,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
|
|||||||
local containerEnv = container.envType;
|
local containerEnv = container.envType;
|
||||||
|
|
||||||
local podLabels = $._config.nodeExporter.labels;
|
local podLabels = $._config.nodeExporter.labels;
|
||||||
local selectorLabels = {
|
local selectorLabels = $._config.nodeExporter.selectorLabels;
|
||||||
[labelName]: $._config.nodeExporter.labels[labelName]
|
|
||||||
for labelName in std.objectFields($._config.nodeExporter.labels)
|
|
||||||
if !std.setMember(labelName, ['app.kubernetes.io/version'])
|
|
||||||
};
|
|
||||||
|
|
||||||
local existsToleration = toleration.new() +
|
local existsToleration = toleration.new() +
|
||||||
toleration.withOperator('Exists');
|
toleration.withOperator('Exists');
|
||||||
@ -168,7 +169,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
|
|||||||
spec: {
|
spec: {
|
||||||
jobLabel: 'app.kubernetes.io/name',
|
jobLabel: 'app.kubernetes.io/name',
|
||||||
selector: {
|
selector: {
|
||||||
matchLabels: $._config.nodeExporter.labels,
|
matchLabels: $._config.nodeExporter.selectorLabels,
|
||||||
},
|
},
|
||||||
endpoints: [
|
endpoints: [
|
||||||
{
|
{
|
||||||
@ -199,7 +200,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
|
|||||||
|
|
||||||
local nodeExporterPort = servicePort.newNamed('https', $._config.nodeExporter.port, 'https');
|
local nodeExporterPort = servicePort.newNamed('https', $._config.nodeExporter.port, 'https');
|
||||||
|
|
||||||
service.new('node-exporter', $.nodeExporter.daemonset.spec.selector.matchLabels, nodeExporterPort) +
|
service.new('node-exporter', $._config.nodeExporter.selectorLabels, nodeExporterPort) +
|
||||||
service.mixin.metadata.withNamespace($._config.namespace) +
|
service.mixin.metadata.withNamespace($._config.namespace) +
|
||||||
service.mixin.metadata.withLabels($._config.nodeExporter.labels) +
|
service.mixin.metadata.withLabels($._config.nodeExporter.labels) +
|
||||||
service.mixin.spec.withClusterIp('None'),
|
service.mixin.spec.withClusterIp('None'),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user