From c7fe300d1da66f1c408d1a8cc140a6647c3b8aae Mon Sep 17 00:00:00 2001 From: Henrik Meinardus Date: Thu, 27 Jun 2024 18:18:43 +0200 Subject: [PATCH 1/2] Make windows-exporter daemonset compatible with multi-arch windows clusters --- .../addons/windows-hostprocess.libsonnet | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet b/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet index d4929d95d6..54d9e6dbed 100644 --- a/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet +++ b/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet @@ -67,7 +67,7 @@ local windowsExporter = function(params) { initContainers: [ { name: 'configure-firewall', - image: 'mcr.microsoft.com/windows/nanoserver:1809', + image: 'mcr.microsoft.com/windows/powershell:nanoserver-lts', resources: we._config.resources, command: [ 'powershell', @@ -93,7 +93,7 @@ local windowsExporter = function(params) { { args: [ '--config.file=%CONTAINER_SANDBOX_MOUNT_POINT%/config.yml', - '--collector.textfile.directory=%CONTAINER_SANDBOX_MOUNT_POINT%', + '--collector.textfile.directories=%CONTAINER_SANDBOX_MOUNT_POINT%', ], name: we._config.name, image: we._config.image + ':' + we._config.version, @@ -118,6 +118,14 @@ local windowsExporter = function(params) { nodeSelector: { 'kubernetes.io/os': 'windows', }, + tolerations: [ + { + key: 'os', + operator: 'Equal', + value: 'windows', + effect: 'NoSchedule', + }, + ], volumes: [ { name: 'windows-exporter-config', From b3fb4d273e6fd22c7052391655e3992c685494e3 Mon Sep 17 00:00:00 2001 From: Henrik Meinardus Date: Thu, 27 Jun 2024 18:27:35 +0200 Subject: [PATCH 2/2] Fix path to powershell image --- jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet b/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet index 54d9e6dbed..b042d3642a 100644 --- a/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet +++ b/jsonnet/kube-prometheus/addons/windows-hostprocess.libsonnet @@ -67,7 +67,7 @@ local windowsExporter = function(params) { initContainers: [ { name: 'configure-firewall', - image: 'mcr.microsoft.com/windows/powershell:nanoserver-lts', + image: 'mcr.microsoft.com/powershell:nanoserver-lts', resources: we._config.resources, command: [ 'powershell',