From 980cf854397d994bd86c25a56be61c5fccf36ff4 Mon Sep 17 00:00:00 2001 From: kerthcet Date: Mon, 2 Aug 2021 23:15:10 +0800 Subject: [PATCH 1/2] revert Bump DynamicKubeConfig metric deprecation to 1.23 by delta update Signed-off-by: kerthcet --- pkg/kubelet/metrics/metrics.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index 02e2aba24b2..4bfc1d55f45 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -367,7 +367,7 @@ var ( Subsystem: KubeletSubsystem, Name: AssignedConfigKey, Help: "The node's understanding of intended config. The count is always 1.", - DeprecatedVersion: "1.23.0", + DeprecatedVersion: "1.22.0", StabilityLevel: metrics.ALPHA, }, []string{ConfigSourceLabelKey, ConfigUIDLabelKey, ConfigResourceVersionLabelKey, KubeletConfigKeyLabelKey}, @@ -378,7 +378,7 @@ var ( Subsystem: KubeletSubsystem, Name: ActiveConfigKey, Help: "The config source the node is actively using. The count is always 1.", - DeprecatedVersion: "1.23.0", + DeprecatedVersion: "1.22.0", StabilityLevel: metrics.ALPHA, }, []string{ConfigSourceLabelKey, ConfigUIDLabelKey, ConfigResourceVersionLabelKey, KubeletConfigKeyLabelKey}, @@ -390,7 +390,7 @@ var ( Subsystem: KubeletSubsystem, Name: LastKnownGoodConfigKey, Help: "The config source the node will fall back to when it encounters certain errors. The count is always 1.", - DeprecatedVersion: "1.23.0", + DeprecatedVersion: "1.22.0", StabilityLevel: metrics.ALPHA, }, []string{ConfigSourceLabelKey, ConfigUIDLabelKey, ConfigResourceVersionLabelKey, KubeletConfigKeyLabelKey}, @@ -401,7 +401,7 @@ var ( Subsystem: KubeletSubsystem, Name: ConfigErrorKey, Help: "This metric is true (1) if the node is experiencing a configuration-related error, false (0) otherwise.", - DeprecatedVersion: "1.23.0", + DeprecatedVersion: "1.22.0", StabilityLevel: metrics.ALPHA, }, ) From 8cf10d9a200f340db4e40f7422c083a2422f0048 Mon Sep 17 00:00:00 2001 From: kerthcet Date: Thu, 5 Aug 2021 01:04:54 +0800 Subject: [PATCH 2/2] set showHiddenMetricsForVersion=1.22 in dynamicKubeletConfiguration test Signed-off-by: kerthcet --- test/e2e_node/dynamic_kubelet_config_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/e2e_node/dynamic_kubelet_config_test.go b/test/e2e_node/dynamic_kubelet_config_test.go index d72aa073177..4c9d312343b 100644 --- a/test/e2e_node/dynamic_kubelet_config_test.go +++ b/test/e2e_node/dynamic_kubelet_config_test.go @@ -106,6 +106,10 @@ var _ = SIGDescribe("[Feature:DynamicKubeletConfig][NodeFeature:DynamicKubeletCo framework.ExpectNoError(err) beforeKC = kc } + + // show hidden metrics for release 1.22 + beforeKC = updateShowHiddenMetricsForVersion(beforeKC, "1.22") + // reset the node's assigned/active/last-known-good config by setting the source to nil, // so each test starts from a clean-slate (&nodeConfigTestCase{ @@ -118,6 +122,9 @@ var _ = SIGDescribe("[Feature:DynamicKubeletConfig][NodeFeature:DynamicKubeletCo framework.ExpectNoError(err) localKC = kc } + + // show hidden metrics for release 1.22 + localKC = updateShowHiddenMetricsForVersion(localKC, "1.22") }) ginkgo.AfterEach(func() { @@ -1191,3 +1198,14 @@ func (tc *nodeConfigTestCase) checkConfigMetrics(f *framework.Framework) { return nil }, timeout, interval).Should(gomega.BeNil()) } + +func updateShowHiddenMetricsForVersion(cfg *kubeletconfig.KubeletConfiguration, version string) *kubeletconfig.KubeletConfiguration { + if cfg == nil { + return &kubeletconfig.KubeletConfiguration{ + ShowHiddenMetricsForVersion: version, + } + } + + cfg.ShowHiddenMetricsForVersion = version + return cfg +}