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

calico cni choice #53

Merged
merged 1 commit into from
Dec 15, 2019
Merged

calico cni choice #53

merged 1 commit into from
Dec 15, 2019

Conversation

palankarravi
Copy link
Contributor

No description provided.

Copy link

@zx1986 zx1986 left a comment

Choose a reason for hiding this comment

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

I had try this, but the CIDR network seems lock on 192.168.0.0/16 by:
https://docs.projectcalico.org/v3.7/manifests/calico.yaml

the part:

            # The default IPv4 pool to create on startup if none exists. Pod IPs will be
            # chosen from this range. Changing this value after installation will have
            # no effect. This should fall within `--cluster-cidr`.
            - name: CALICO_IPV4POOL_CIDR
              value: "192.168.0.0/16"

@geerlingguy
Copy link
Owner

@zx1986 - You should be able to override the cidr kubernetes picks up with:

kubernetes_pod_network_cidr: '192.168.0.0/16'

@@ -21,7 +21,12 @@ kubernetes_allow_pods_on_master: true
kubernetes_enable_web_ui: true
kubernetes_web_ui_manifest_file: https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/recommended/kubernetes-dashboard.yaml

kubernetes_pod_network_cidr: '10.244.0.0/16'
kubernetes_cni: 'calico'
kubernetes_pod_network:
Copy link
Owner

Choose a reason for hiding this comment

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

I'm kind of torn on this 'hack' (what I'll call it) to loop through each network and only react on the one that matches based on a string condition.

I'd kind of rather have the user choose something like:

kubernetes_pod_network:
  cni: 'calico'
  cidr: '10.244.0.0/16'

And then change the other vars accordingly. Maybe we also split out all CNI-specific stuff into its own task files? So one in tasks/cni-flannel.yml, another in tasks/cni-calico.yml? That way if someone also wants to add Weave support it's easy to see the pattern.

- name: 'flannel'
cidr: '10.244.0.0/16'
- name: 'calico'
cidr: '192.168.0.0/16'
Copy link

Choose a reason for hiding this comment

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

this cidr config will be override by CALICO_IPV4POOL_CIDR in https://docs.projectcalico.org/v3.7/manifests/calico.yaml

            # The default IPv4 pool to create on startup if none exists. Pod IPs will be
            # chosen from this range. Changing this value after installation will have
            # no effect. This should fall within `--cluster-cidr`.
            - name: CALICO_IPV4POOL_CIDR
              value: "192.168.0.0/16"

zx1986 added a commit to LarvataTW/ansible-kubernetes that referenced this pull request Oct 3, 2019
@geerlingguy geerlingguy merged commit 8d4e1b4 into geerlingguy:master Dec 15, 2019
geerlingguy added a commit that referenced this pull request Dec 15, 2019
vulturm pushed a commit to vulturm/ansible-role-kubernetes that referenced this pull request Mar 23, 2020
=============================================
This represents the squashed history as it is not too relevant for us..

Below are all the commit messages:
=============================================

Change a line to trigger a Travis CI build.

A few small fixes for automated test builds.

More updates to make things work better in various situations.

Fix idempotence for web ui enablement.

Fix dashboard UI service.

Fix kube utils installation not working on Debian.

Fix install on CentOS 7.

Fix idempotence for Flannel networking task.

Really fix idempotence for Flannel tasks, and get CentOS mostly working.

Add more variables and docs.

Space in the defaults file. [ci skip]

Issue geerlingguy#3: Allow failures on CentOS 7 Travis CI build for now.

Fixes geerlingguy#2: Make role work with nodes joining master.

Spellcheck.

Reload kubelet unit file if config is changed.

Fixes geerlingguy#3: CentOS builds now passing.

Change order when applying flannel templates.

Issue geerlingguy#5: Add more configuration ability to default Flannel network manifests.

Tick kubernetes stable version up from 1.10 to 1.11

Fixes geerlingguy#10: Set kubernetes_join_command more reliably.

Fixes geerlingguy#15: Add kubelet extra args to the correct file for 1.11 and beyond.

Fixes geerlingguy#16: CentOS 7 configuration of KUBELET_EXTRA_ARGS was broken.

Update master-setup.yml

Add option for additional kubeadm init options

Update main.yml

kubeadm_init_opts default value

Changes for the comments under PR geerlingguy#19

Switch tests to use Molecule.

Issue geerlingguy#17: Attempt to fix installation on CentOS.

Issue geerlingguy#18: Attempt to fix version pinning issues on RedHat and Debian.

Fix boolean on Debian setup, add more tests.

Fixing lint issues

incredibly sloppy day.

fix typo kuberenetes

PR geerlingguy#24 follow-up: Use verbosity instead of debug variable for debug info.

Update tests for optimum efficiency.

Fix YAML error in molecule config.

Fixes failing Ubuntu 18.04 test.

Fix some new ansible-lint issues.

Issue geerlingguy#33: Set default Kubernetes version to 1.13.1.

Bump Kubernetes RHEL package to 1.13.3.

Fix ansible-lint issue - ignore rule 306.

Update kubelet-setup.yml

geerlingguy#42

Use same options for all tests and default to Ansible IP correctly.

Remove unused tests.

Fixes geerlingguy#54: Update to Kubernetes 1.15.

Fixes geerlingguy#55: Support and test Debian 10 Buster.

Fix typo referenced in geerlingguy#49

Update main.yml

Create FUNDING.yml

YAML syntax fix.

Add kubernetes_join_command_extra_opts variable.

calico cni choice

PR geerlingguy#53 follow-up: Requested changes for simplicity.

PR geerlingguy#53 follow-up: Add test for calico networking.

PR geerlingguy#53 follow-up: Remove extra conditional.

Bump to Kubernetes 1.16.

Default to calico 3.10 manifest.

PR geerlingguy#53 follow-up: Remove extra unneccessary loop.

Fix README formatting.

Add a test for CentOS 8.

Update molecule configuration to work with 3.0.

Update molecule configuration to work with 3.0.

Update molecule configuration to work with 3.0.

Make sure molecule lint script has set -e option.

Add probot/stale configuration to repository for stale issues.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants