From 2195a9d7ebf4e87dde0b86014a5cc47f229f75d4 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 14 Sep 2024 10:12:44 +0300 Subject: [PATCH] Disable node-problem-detector containerd and kubelet checks --- ...s_s3_object_many-addons.example.com-addons-bootstrap_content | 2 +- ...-addons-node-problem-detector.addons.k8s.io-k8s-1.17_content | 2 +- .../node-problem-detector.addons.k8s.io/k8s-1.17.yaml.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content index bda32c6935e07..d02d8706be74e 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content @@ -163,7 +163,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: node-problem-detector.addons.k8s.io/k8s-1.17.yaml - manifestHash: c5efa7accf480cced0a3610be297e7109361d2a8c101e3dce086d256ec7e706f + manifestHash: 94b31d90ea983e0cb64dc233c11174684a0b0fb18ea9cd7cbc93013881e1a230 name: node-problem-detector.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-problem-detector.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-problem-detector.addons.k8s.io-k8s-1.17_content index 8bfe13aeaeee9..93926cbe34ba1 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-problem-detector.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-problem-detector.addons.k8s.io-k8s-1.17_content @@ -69,7 +69,7 @@ spec: - /node-problem-detector - --logtostderr - --config.system-log-monitor=/config/kernel-monitor.json,/config/systemd-monitor.json - - --config.custom-plugin-monitor=/config/kernel-monitor-counter.json,/config/systemd-monitor-counter.json,/config/health-checker-containerd.json,/config/health-checker-kubelet.json + - --config.custom-plugin-monitor=/config/kernel-monitor-counter.json,/config/systemd-monitor-counter.json - --config.system-stats-monitor=/config/system-stats-monitor.json env: - name: NODE_NAME diff --git a/upup/models/cloudup/resources/addons/node-problem-detector.addons.k8s.io/k8s-1.17.yaml.template b/upup/models/cloudup/resources/addons/node-problem-detector.addons.k8s.io/k8s-1.17.yaml.template index 37b10b055aa97..4cdfc53e19c74 100644 --- a/upup/models/cloudup/resources/addons/node-problem-detector.addons.k8s.io/k8s-1.17.yaml.template +++ b/upup/models/cloudup/resources/addons/node-problem-detector.addons.k8s.io/k8s-1.17.yaml.template @@ -55,7 +55,7 @@ spec: - /node-problem-detector - --logtostderr - --config.system-log-monitor=/config/kernel-monitor.json,/config/systemd-monitor.json - - --config.custom-plugin-monitor=/config/kernel-monitor-counter.json,/config/systemd-monitor-counter.json,/config/health-checker-containerd.json,/config/health-checker-kubelet.json + - --config.custom-plugin-monitor=/config/kernel-monitor-counter.json,/config/systemd-monitor-counter.json - --config.system-stats-monitor=/config/system-stats-monitor.json image: {{ .Image }} securityContext: