Add relabeling to have the correct node name

This commit is contained in:
Carlos de Paula 2020-05-25 19:14:28 -03:00
parent 4ddebeb5b8
commit 3a93f39647
2 changed files with 19 additions and 2 deletions

View File

@ -73,7 +73,7 @@ local utils = import 'utils.libsonnet';
daemonset.mixin.spec.selector.withMatchLabels(podLabels) +
daemonset.mixin.spec.template.metadata.withLabels(podLabels) +
daemonset.mixin.spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.withNodeSelectorTerms([{ matchExpressions: [{ key: 'kubernetes.io/arch', operator: 'In', values: ['arm', 'arm64'] }] }]) +
daemonset.mixin.spec.template.spec.withTolerations([{ 'operator': 'Exists' }]) +
daemonset.mixin.spec.template.spec.withTolerations([{ operator: 'Exists' }]) +
daemonset.mixin.spec.template.spec.withServiceAccountName('arm-exporter') +
daemonset.mixin.spec.template.spec.withContainers(c),

View File

@ -196,6 +196,15 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
port: portName,
scheme: portScheme,
interval: '30s',
relabelings: [
{
action: 'replace',
regex: '(.*)',
replacement: '$1',
sourceLabels: ['__meta_kubernetes_pod_node_name'],
targetLabel: 'instance',
},
],
},
],
namespaceSelector: {
@ -219,13 +228,21 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
tlsConfig: {
insecureSkipVerify: true,
},
relabelings: [
{
action: 'replace',
regex: '(.*)',
replacement: '$1',
sourceLabels: ['__meta_kubernetes_pod_node_name'],
targetLabel: 'instance',
},
],
}],
},
};
std.mergePatch(s, t)
),
// Adds arguments to a container in a deployment
// args is an array of arguments in the format
// ["arg1","arg2",]