From 8db0017e625db798c5373943b66536473ba12847 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 8 May 2020 10:42:07 -0400 Subject: [PATCH] kube-apiserver-healthcheck: actually enable on 1.17 We cherry picked the support to 1.17, but now we need to activate the feature. --- pkg/model/components/apiserver.go | 2 +- pkg/model/components/kubeapiserver/model.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/model/components/apiserver.go b/pkg/model/components/apiserver.go index 6eb201903952f..4c21fe3d7bc06 100644 --- a/pkg/model/components/apiserver.go +++ b/pkg/model/components/apiserver.go @@ -233,7 +233,7 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error { // We make sure to disable AnonymousAuth c.AnonymousAuth = fi.Bool(false) - if b.IsKubernetesGTE("1.18") { + if b.IsKubernetesGTE("1.17") { // We query via the kube-apiserver-healthcheck proxy, which listens on port 8080 c.InsecurePort = 0 } else { diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go index af08da4ee9a9f..1c65e6fad153a 100644 --- a/pkg/model/components/kubeapiserver/model.go +++ b/pkg/model/components/kubeapiserver/model.go @@ -41,8 +41,8 @@ func (b *KubeApiserverBuilder) useHealthCheckSidecar(c *fi.ModelBuilderContext) // Should we use our health-check proxy, which allows us to // query the secure port without enabling anonymous auth? useHealthCheckSidecar := true - // We only turn on the proxy in k8s 1.18 and above - if b.IsKubernetesLT("1.18") { + // We only turn on the proxy in k8s 1.17 and above + if b.IsKubernetesLT("1.17") { useHealthCheckSidecar = false }