mirror of
				https://github.com/carlosedp/cluster-monitoring.git
				synced 2025-10-26 10:23:04 +01:00 
			
		
		
		
	Merge pull request #45 from carlosedp/fix-43
This commit is contained in:
		
						commit
						a1752635cf
					
				@ -73,7 +73,7 @@ local utils = import 'utils.libsonnet';
 | 
				
			|||||||
      daemonset.mixin.spec.selector.withMatchLabels(podLabels) +
 | 
					      daemonset.mixin.spec.selector.withMatchLabels(podLabels) +
 | 
				
			||||||
      daemonset.mixin.spec.template.metadata.withLabels(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.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.withServiceAccountName('arm-exporter') +
 | 
				
			||||||
      daemonset.mixin.spec.template.spec.withContainers(c),
 | 
					      daemonset.mixin.spec.template.spec.withContainers(c),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -196,6 +196,15 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 | 
				
			|||||||
            port: portName,
 | 
					            port: portName,
 | 
				
			||||||
            scheme: portScheme,
 | 
					            scheme: portScheme,
 | 
				
			||||||
            interval: '30s',
 | 
					            interval: '30s',
 | 
				
			||||||
 | 
					            relabelings: [
 | 
				
			||||||
 | 
					              {
 | 
				
			||||||
 | 
					                action: 'replace',
 | 
				
			||||||
 | 
					                regex: '(.*)',
 | 
				
			||||||
 | 
					                replacement: '$1',
 | 
				
			||||||
 | 
					                sourceLabels: ['__meta_kubernetes_pod_node_name'],
 | 
				
			||||||
 | 
					                targetLabel: 'instance',
 | 
				
			||||||
 | 
					              },
 | 
				
			||||||
 | 
					            ],
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
        ],
 | 
					        ],
 | 
				
			||||||
        namespaceSelector: {
 | 
					        namespaceSelector: {
 | 
				
			||||||
@ -219,13 +228,21 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 | 
				
			|||||||
          tlsConfig: {
 | 
					          tlsConfig: {
 | 
				
			||||||
            insecureSkipVerify: true,
 | 
					            insecureSkipVerify: true,
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
 | 
					          relabelings: [
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					              action: 'replace',
 | 
				
			||||||
 | 
					              regex: '(.*)',
 | 
				
			||||||
 | 
					              replacement: '$1',
 | 
				
			||||||
 | 
					              sourceLabels: ['__meta_kubernetes_pod_node_name'],
 | 
				
			||||||
 | 
					              targetLabel: 'instance',
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					          ],
 | 
				
			||||||
        }],
 | 
					        }],
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    std.mergePatch(s, t)
 | 
					    std.mergePatch(s, t)
 | 
				
			||||||
  ),
 | 
					  ),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
  // Adds arguments to a container in a deployment
 | 
					  // Adds arguments to a container in a deployment
 | 
				
			||||||
  // args is an array of arguments in the format
 | 
					  // args is an array of arguments in the format
 | 
				
			||||||
  // ["arg1","arg2",]
 | 
					  // ["arg1","arg2",]
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user