Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kube-apiserver-healthcheck: actually enable on 1.17 #9098

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/model/components/apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/kubeapiserver/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down