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

Cleanup code to prepare Windows Container support #4746

Closed
wants to merge 3 commits into from
Closed

Cleanup code to prepare Windows Container support #4746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b002a1
Remove ingress default-backend svc
okamototk May 11, 2019
e7c89d5
Fix schedule localdns DaemonSet to only linux node.
okamototk May 11, 2019
6bae32c
Flannel VXLAN parameter VNI and Port are configurable.
okamototk May 11, 2019
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
5 changes: 5 additions & 0 deletions inventory/sample/group_vars/k8s-cluster/k8s-net-flannel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@
# for experimental backend
# please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md
# flannel_backend_type: "vxlan"
# flannel_vxlan_vni: 1
# flannel_vxlan_port: 8472
# For Windows Container, use following values:
okamototk marked this conversation as resolved.
Show resolved Hide resolved
# flannel_vxlan_vni: 4096
# flannel_vxlan_port: 4789
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ spec:
operator: "Exists"
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: node-cache
image: "{{ nodelocaldns_image_repo }}:{{ nodelocaldns_image_tag }}"
Expand Down
1 change: 0 additions & 1 deletion roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
set_fact:
ingress_nginx_templates:
- { name: 00-namespace, file: 00-namespace.yml, type: ns }
- { name: svc-default-backend, file: svc-default-backend.yml, type: svc }
- { name: cm-ingress-nginx, file: cm-ingress-nginx.yml, type: cm }
- { name: cm-tcp-services, file: cm-tcp-services.yml, type: cm }
- { name: cm-udp-services, file: cm-udp-services.yml, type: cm }
Expand Down
16 changes: 0 additions & 16 deletions roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions roles/network_plugin/flannel/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# You can choose what type of flannel backend to use
# please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md
flannel_backend_type: "vxlan"
flannel_vxlan_vni: 1
flannel_vxlan_port: 8472

# Limits for apps
flannel_memory_limit: 500M
Expand Down
5 changes: 4 additions & 1 deletion roles/network_plugin/flannel/templates/cni-flannel.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ data:
{
"Network": "{{ kube_pods_subnet }}",
"Backend": {
"Type": "{{ flannel_backend_type }}"
"Type": "{{ flannel_backend_type }}"{% if flannel_backend_type == "vxlan" %},
"VNI": {{ flannel_vxlan_vni }},
"Port": {{ flannel_vxlan_port }}
{% endif %}
}
}
---
Expand Down