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

Add config option for kube-proxy mode to cluster CR #4247

Merged
merged 3 commits into from
Sep 4, 2019

Conversation

nikhita
Copy link
Contributor

@nikhita nikhita commented Sep 4, 2019

Fixes #3935

Defaults to ipvs, if not specified.

For older clusters, they are migrated with proxy mode set to iptables
since that was the one used before.

Does this PR introduce a user-facing change?:

The kube-proxy mode (ipvs/iptables) can now be configured. If not specified, it defaults to ipvs.

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. team/lifecycle size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 4, 2019
Defaults to ipvs, if not specified.

For older clusters, they are migrated with proxy mode set to iptables
since that was the one used before.
@nikhita
Copy link
Contributor Author

nikhita commented Sep 4, 2019

 --- FAIL: TestRetagImageForAllVersions (0.71s)
    main_test.go:31: Error calling getImagesForVersion: failed to get images from addons: failed to get images for addon kube-proxy: failed to parse addon templates in ../../../addons/kube-proxy: failed to execute templating on file ../../../addons/kube-proxy/configmap.yaml: template: configmap.yaml:42:21: executing "configmap.yaml" at <.Cluster.Address.ProxyMode>: can't evaluate field ProxyMode in type v1.ClusterAddress
    main_test.go:31: Error calling getImagesForVersion: failed to get images from addons: failed to get images for addon kube-proxy: failed to parse addon templates in ../../../addons/kube-proxy: failed to execute templating on file ../../../addons/kube-proxy/configmap.yaml: template: configmap.yaml:42:21: executing "configmap.yaml" at <.Cluster.Address.ProxyMode>: can't evaluate field ProxyMode in type v1.ClusterAddress
    main_test.go:31: Error calling getImagesForVersion: failed to get images from addons: failed to get images for addon kube-proxy: failed to parse addon templates in ../../../addons/kube-proxy: failed to execute templating on file ../../../addons/kube-proxy/configmap.yaml: template: configmap.yaml:42:21: executing "configmap.yaml" at <.Cluster.Address.ProxyMode>: can't evaluate field ProxyMode in type v1.ClusterAddress
    main_test.go:31: Error calling getImagesForVersion: failed to get images from addons: failed to get images for addon kube-proxy: failed to parse addon templates in ../../../addons/kube-proxy: failed to execute templating on file ../../../addons/kube-proxy/configmap.yaml: template: configmap.yaml:42:21: executing "configmap.yaml" at <.Cluster.Address.ProxyMode>: can't evaluate field ProxyMode in type v1.ClusterAddress 

I'm guessing this part needs to be updated after the PR is merged so the image is updated too:

@nikhita
Copy link
Contributor Author

nikhita commented Sep 4, 2019

/assign @alvaroaleman

@alvaroaleman
Copy link
Contributor

@nikhita You also need to set that in addons/kube-proxy/configmap.yaml, else this setting has no effect

@nikhita
Copy link
Contributor Author

nikhita commented Sep 4, 2019

/retest

@nikhita
Copy link
Contributor Author

nikhita commented Sep 4, 2019

/retest

now that the image was actually updated

@alvaroaleman
Copy link
Contributor

@nikhita I think the issue is that the addon references .Cluster.Address.ProxyMode which doesn't exist, its in .Cluster.Spec.ClusterNetwork or sth

@nikhita
Copy link
Contributor Author

nikhita commented Sep 4, 2019

All green! :)

@alvaroaleman
Copy link
Contributor

Just wanna quickly verify this works on all distributions, other than that, lgtm
/test pull-kubermatic-e2e-do-centos-1.15
/test pull-kubermatic-e2e-hetzner-ubuntu-1.15

@alvaroaleman
Copy link
Contributor

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 4, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ef8efaa8f494f3108cb838397d384b58904e26ca

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 4, 2019
@kubermatic-bot kubermatic-bot merged commit 8afd10e into master Sep 4, 2019
@kubermatic-bot kubermatic-bot added this to the v2.12 milestone Sep 4, 2019
@kubermatic-bot kubermatic-bot deleted the kube-proxy-mode branch September 4, 2019 15:23
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. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add configoption for kube-proxy mode (iptables/ipvs) to the cluster CR
3 participants