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

Jump to bottom

Added ability to set calico vxlan vni and port. defaults to calico's … #6678

Merged
merged 4 commits into from
Sep 22, 2020
Merged

Added ability to set calico vxlan vni and port. defaults to calico's … #6678

merged 4 commits into from
Sep 22, 2020

Conversation

dlouks
Copy link
Contributor

@dlouks dlouks commented Sep 14, 2020 •
edited

What type of PR is this?
/kind feature

What this PR does / why we need it: In order to run Calico with VXLAN enabled and on non default ports and unique VNI

Which issue(s) this PR fixes:

Fixes #6677

Special notes for your reviewer:

Does this PR introduce a user-facing change?: No

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 14, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @dlouks. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 14, 2020
@dlouks dlouks marked this pull request as ready for review September 14, 2020 21:50
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 14, 2020
@floryut
Copy link
Member

floryut commented Sep 15, 2020

/ok-to-test

Please check CI

failed: [instance-1] (item={'name': 'calico-node', 'file': 'calico-node.yml', 'type': 'ds'}) => {"ansible_loop_var": "item", "changed": false, "item": {"file": "calico-node.yml", "name": "calico-node", "type": "ds"}, "msg": "AnsibleUndefinedVariable: 'calico_network_backend' is undefined"}

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 15, 2020
@floryut
Copy link
Member

floryut commented Sep 16, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2020
hafe
hafe reviewed Sep 16, 2020
View reviewed changes
roles/network_plugin/calico/templates/calico-node.yml.j2 Outdated
{% endif %}
{% if calico_network_backend is defined and calico_network_backend == 'vxlan' %}
- name: FELIX_VXLANNVI
value: "{{ calico_vxlan_vni | default(4096) }}"
Copy link
Contributor

@hafe hafe Sep 16, 2020 •
edited

Choose a reason for hiding this comment

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

please put the default value in defaults/main.yml and don't hide it here (same below)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've removed the hidden defaults and added them to defauls/main.yml

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 17, 2020
@EppO
Copy link
Contributor

EppO commented Sep 17, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 17, 2020
Miouge1
Miouge1 reviewed Sep 18, 2020
View reviewed changes
roles/network_plugin/calico/templates/calico-node.yml.j2 Outdated
@@ -173,6 +173,12 @@ spec:
# Wait for the datastore.
- name: WAIT_FOR_DATASTORE
value: "true"
{% endif %}
{% if calico_network_backend is defined and calico_network_backend == 'vxlan' %}
- name: FELIX_VXLANNVI
Copy link
Contributor

Choose a reason for hiding this comment

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

I do not find documentation about this variable in the docs: https://docs.projectcalico.org/reference/felix/configuration

Any ideas where I can find info on this?

Copy link
Member

Choose a reason for hiding this comment

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

Nice catch @Miouge1 ... correct variable is FELIX_VXLANVNI and not FELIX_VXLANNVI

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you @Miouge1! I've corrected the typo.

@floryut
Copy link
Member

floryut commented Sep 18, 2020

/hold
@dlouks please see comments, thank you

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 18, 2020
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 18, 2020
@floryut
Copy link
Member

floryut commented Sep 18, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 18, 2020
@floryut
Copy link
Member

floryut commented Sep 21, 2020

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 21, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Sep 22, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dlouks, Miouge1

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 22, 2020
@k8s-ci-robot k8s-ci-robot merged commit 1e79dcf into kubernetes-sigs:master Sep 22, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Sep 23, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
d068d01 
* 'master' of https://github.com/kubernetes-sigs/kubespray:
  remove variable 'etcd_ionice', because ionice removed from container image etcd:v3.4.x (kubernetes-sigs#6735)
  calico: default to using kdd datastore (kubernetes-sigs#6693)
  Update docker packages to 19.03.13 + add docker f32 (kubernetes-sigs#6712)
  Fix snapshot.storage apiVersion (kubernetes-sigs#6711)
  properly generate extravolumes in kubeadmconfig for centos (kubernetes-sigs#6708)
  Fix reserved memory unit in kubelet configuration (kubernetes-sigs#6725)
  Fix unintended SIGPIPE (kubernetes-sigs#6721)
  Expose offline install overrides in inventory (kubernetes-sigs#6728)
  Added ability to set calico vxlan vni and port. defaults to calico's … (kubernetes-sigs#6678)
  Change health check from TCP to HTTPS (kubernetes-sigs#6487)
  Add multi architeture support to flannel (kubernetes-sigs#6166)
  Remove pypi repo and pip extra flags (kubernetes-sigs#6729)
  Fails if kubeadm_version do not matches kubernetes version (kubernetes-sigs#6302)
  Add external_openstack_lbaas_provider setting for occm (kubernetes-sigs#6566)
  add new variable allowing additionnal audit webhook server options (kubernetes-sigs#6726)
  Fix example value for etcd_quota_backend_bytes (kubernetes-sigs#6724)
  Added support for setting tiller_service_account and tiller_replicas (kubernetes-sigs#6696)
@floryut floryut mentioned this pull request Dec 19, 2020
Closed
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jan 16, 2021
@dlouks @LuckySB
Added ability to set calico vxlan vni and port. defaults to calico's … (
ea8d4b2 
kubernetes-sigs#6678)

* Added ability to set calico vxlan vni and port. defaults to calico's documented defaults.

* Check if calico_network_backend is defined prior to checking value

* Removed calico hidden defaults for vxlan port and vni

* Fixed FELIX_VXLANVNI typo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hafe hafe hafe left review comments

@Miouge1 Miouge1 Miouge1 left review comments

@floryut floryut floryut left review comments

@EppO EppO Awaiting requested review from EppO

@holmsten holmsten Awaiting requested review from holmsten

Assignees

@EppO EppO

@floryut floryut

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. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Calico - Make VXLAN VNI and Port Configurable
6 participants
@dlouks @k8s-ci-robot @floryut @EppO @Miouge1 @hafe