From 3d8f57fa24e86d52a720f33740b386ef7968ade0 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sun, 18 Aug 2019 19:53:15 -0400 Subject: [PATCH] Dont set CriticalPodAnnotation feature gate in k8s 1.16 The E2E tests are currently failing [0] due to this kubelet error [1]: `F0818 22:43:57.642896 6424 server.go:179] unrecognized feature gate: ExperimentalCriticalPodAnnotation` This feature gate was removed in Kubernetes 1.16 [2] [0] https://testgrid.k8s.io/sig-cluster-lifecycle-kops#kops-aws-1.14 [1] https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-beta/1163216201782923264/artifacts/52.77.251.45/kubelet.log [2] https://github.com/kubernetes/kubernetes/pull/80342 --- pkg/model/components/kubelet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go index 3983aa65da828..ac52de90ca919 100644 --- a/pkg/model/components/kubelet.go +++ b/pkg/model/components/kubelet.go @@ -243,7 +243,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { clusterSpec.Kubelet.FeatureGates = make(map[string]string) } if _, found := clusterSpec.Kubelet.FeatureGates["ExperimentalCriticalPodAnnotation"]; !found { - if b.Context.IsKubernetesGTE("1.5.2") { + if b.Context.IsKubernetesGTE("1.5.2") && b.Context.IsKubernetesLT("1.16") { clusterSpec.Kubelet.FeatureGates["ExperimentalCriticalPodAnnotation"] = "true" } }