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.

Sign up for GitHub

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 #9095

Merged
merged 1 commit into from
May 8, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
c.AnonymousAuth = fi.Bool(false)
}

if b.IsKubernetesGTE("1.18") {
if b.IsKubernetesGTE("1.17") {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll want to change this on master branch as well. How about first landing to master and then cherrypicking?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, that's an easy follow up.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops - will send PR to master now :-)

// We query via the kube-apiserver-healthcheck proxy, which listens on port 8080
c.InsecurePort = 0
} else {
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/components/kubeapiserver/model.go
View file
Open in desktop
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 Expand Up @@ -94,7 +94,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: kope/kube-apiserver-healthcheck:1.18.0-alpha.3
image: kope/kube-apiserver-healthcheck:1.17.0-beta.2
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Contents:
- --client-key=/secrets/client.key
command:
- /usr/bin/kube-apiserver-healthcheck
image: kope/kube-apiserver-healthcheck:1.18.0-alpha.3
image: kope/kube-apiserver-healthcheck:1.17.0-beta.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down