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

Fix Kubernetes 1.11 builds #2943

Merged
merged 4 commits into from
Jul 4, 2018
Merged

Fix Kubernetes 1.11 builds #2943

merged 4 commits into from
Jul 4, 2018

Conversation

dlorenc
Copy link
Contributor

@dlorenc dlorenc commented Jun 28, 2018

Add a versioned flag for the enable-admission-control flags
Add a second step to call "kubeadm alpha phase addon all" which seems to be required now to get coredns running.

I tested this all the way back to 1.9.0.

This should fix #2942

Add a versioned flag for the enable-admission-control flags
Add a second step to call "kubeadm alpha phase addon all" which seems to be required now to get coredns running.

I tested this all the way back to 1.9.0.
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 28, 2018
@@ -205,8 +205,17 @@ var versionSpecificOpts = []VersionedExtraOption{
Key: "admission-control",
Value: strings.Join(util.DefaultAdmissionControllers, ","),
},
LessThanOrEqual: semver.MustParse("1.10.10"),

Choose a reason for hiding this comment

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

Won't this break when there's a 1.10.11 ? Does semver.MustParse("1.10.*") not work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The semver library doesn't support *'s :(

panic: semver: Parse(1.10.*): Invalid character(s) found in patch number "*"

I'll change to something like 1000

{
Option: util.ExtraOption{
Component: Apiserver,
Key: "enable-admission-plugins",

Choose a reason for hiding this comment

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

Is this necessary? I got a working cluster with just removing the admission-control line from /var/lib/kubeadm.yaml, so the rest of the default manifest was fine without needing any more overrides.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's not necessary, but we pass some different defaults than kubeadm.

@dlorenc
Copy link
Contributor Author

dlorenc commented Jul 3, 2018

@minikube-bot test this please

@jimmidyson
Copy link
Member

Hope you don't mind @dlorenc but in a bid to get this merged I've just fixed up tests (and added a change to Makefile to work for devs - like me - that have no explicit GOPATH env var set).

@jimmidyson
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 4, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dlorenc, jimmidyson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jimmidyson
Copy link
Member

This is ready for merge IMO @Arnavion @dlorenc

@dlorenc
Copy link
Contributor Author

dlorenc commented Jul 4, 2018

This is ready for merge IMO @Arnavion @dlorenc

Thanks!

@dlorenc dlorenc merged commit c318a93 into kubernetes:master Jul 4, 2018
@dlorenc dlorenc deleted the fix1.11 branch July 4, 2018 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot deploy v1.11.0 because minikube puts bad default parameters in kube-apiserver manifest
4 participants