From dcf8200d283c5018d3b137e6057a793885478cd0 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Wed, 16 Oct 2019 16:33:08 +0200 Subject: [PATCH 1/2] Bump default NodeStatusReportFrequency to 5m --- pkg/kubelet/apis/config/v1beta1/defaults.go | 2 +- pkg/kubemark/hollow_kubelet.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/apis/config/v1beta1/defaults.go b/pkg/kubelet/apis/config/v1beta1/defaults.go index 170b6ac8bda..61daafc113d 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults.go @@ -112,7 +112,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura // set to NodeStatusUpdateFrequency if NodeStatusUpdateFrequency is set // explicitly. if obj.NodeStatusUpdateFrequency == zeroDuration { - obj.NodeStatusReportFrequency = metav1.Duration{Duration: time.Minute} + obj.NodeStatusReportFrequency = metav1.Duration{Duration: 5 * time.Minute} } else { obj.NodeStatusReportFrequency = obj.NodeStatusUpdateFrequency } diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index d1dbbf743b9..431a42f8567 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -177,7 +177,7 @@ func GetHollowKubeletConfig(opt *HollowKubletOptions) (*options.KubeletFlags, *k c.FileCheckFrequency.Duration = 20 * time.Second c.HTTPCheckFrequency.Duration = 20 * time.Second c.NodeStatusUpdateFrequency.Duration = 10 * time.Second - c.NodeStatusReportFrequency.Duration = time.Minute + c.NodeStatusReportFrequency.Duration = 5 * time.Minute c.SyncFrequency.Duration = 10 * time.Second c.EvictionPressureTransitionPeriod.Duration = 5 * time.Minute c.MaxPods = int32(opt.MaxPods) From 12c8b4a9df92301bf7a304527967595868d83167 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Thu, 31 Oct 2019 10:44:56 +0100 Subject: [PATCH 2/2] Bumpd NodeProblemDetector --- cluster/addons/node-problem-detector/npd.yaml | 10 +++++----- cluster/gce/gci/configure.sh | 4 ++-- test/kubemark/resources/hollow-node_template.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster/addons/node-problem-detector/npd.yaml b/cluster/addons/node-problem-detector/npd.yaml index 1768ca98f41..6caa9c60a66 100644 --- a/cluster/addons/node-problem-detector/npd.yaml +++ b/cluster/addons/node-problem-detector/npd.yaml @@ -26,28 +26,28 @@ subjects: apiVersion: apps/v1 kind: DaemonSet metadata: - name: npd-v0.7.1 + name: npd-v0.8.0 namespace: kube-system labels: k8s-app: node-problem-detector - version: v0.7.1 + version: v0.8.0 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: node-problem-detector - version: v0.7.1 + version: v0.8.0 template: metadata: labels: k8s-app: node-problem-detector - version: v0.7.1 + version: v0.8.0 kubernetes.io/cluster-service: "true" spec: containers: - name: node-problem-detector - image: k8s.gcr.io/node-problem-detector:v0.7.1 + image: k8s.gcr.io/node-problem-detector:v0.8.0 command: - "/bin/sh" - "-c" diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 4f38c61c2bf..639f4a8f4bd 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -26,8 +26,8 @@ set -o pipefail ### Hardcoded constants DEFAULT_CNI_VERSION="v0.7.5" DEFAULT_CNI_SHA1="52e9d2de8a5f927307d9397308735658ee44ab8d" -DEFAULT_NPD_VERSION="v0.7.1" -DEFAULT_NPD_SHA1="a9cae965973d586bf5206ad4fe5aae07e6bfd154" +DEFAULT_NPD_VERSION="v0.8.0" +DEFAULT_NPD_SHA1="9406c975b1b035995a137029a004622b905b4e7f" DEFAULT_CRICTL_VERSION="v1.16.1" DEFAULT_CRICTL_SHA1="8d7b788bf0a52bd3248407c6ebf779ffead27c99" DEFAULT_MOUNTER_TAR_SHA="8003b798cf33c7f91320cd6ee5cec4fa22244571" diff --git a/test/kubemark/resources/hollow-node_template.yaml b/test/kubemark/resources/hollow-node_template.yaml index af04b33e307..f857d3f92e4 100644 --- a/test/kubemark/resources/hollow-node_template.yaml +++ b/test/kubemark/resources/hollow-node_template.yaml @@ -93,7 +93,7 @@ spec: cpu: {{HOLLOW_PROXY_CPU}}m memory: {{HOLLOW_PROXY_MEM}}Ki - name: hollow-node-problem-detector - image: k8s.gcr.io/node-problem-detector:v0.4.1 + image: k8s.gcr.io/node-problem-detector:v0.8.0 env: - name: NODE_NAME valueFrom: