From 9b002a1905f9a0b4cb822789fa6c4b4a9f2a1b4d Mon Sep 17 00:00:00 2001 From: Takashi Okamoto Date: Sat, 11 May 2019 14:45:48 +0000 Subject: [PATCH 1/3] Remove ingress default-backend svc * default-backend svc doesn't have any endpoints. --- .../ingress_nginx/tasks/main.yml | 1 - .../templates/svc-default-backend.yml.j2 | 16 ---------------- 2 files changed, 17 deletions(-) delete mode 100644 roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml b/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml index 6858426f24e..b8c575817e9 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml +++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml @@ -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 } diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 deleted file mode 100644 index 9c95e870170..00000000000 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: default-backend - namespace: {{ ingress_nginx_namespace }} - labels: - app.kubernetes.io/name: default-backend - app.kubernetes.io/part-of: ingress-nginx -spec: - ports: - - port: 80 - targetPort: 8080 - selector: - app.kubernetes.io/name: default-backend - app.kubernetes.io/part-of: ingress-nginx From e7c89d59a2553d3e232baac2727df7e36adad05d Mon Sep 17 00:00:00 2001 From: Takashi Okamoto Date: Sat, 11 May 2019 23:52:54 +0000 Subject: [PATCH 2/3] Fix schedule localdns DaemonSet to only linux node. --- .../ansible/templates/nodelocaldns-daemonset.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 index 98f877caa43..324e9ed63b0 100644 --- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 @@ -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 }}" From 6bae32c73a1a7fa57439bbdae852a568fdc0d44b Mon Sep 17 00:00:00 2001 From: Takashi Okamoto Date: Sat, 11 May 2019 23:55:24 +0000 Subject: [PATCH 3/3] Flannel VXLAN parameter VNI and Port are configurable. --- inventory/sample/group_vars/k8s-cluster/k8s-net-flannel.yml | 5 +++++ roles/network_plugin/flannel/defaults/main.yml | 2 ++ roles/network_plugin/flannel/templates/cni-flannel.yml.j2 | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-net-flannel.yml b/inventory/sample/group_vars/k8s-cluster/k8s-net-flannel.yml index be1245a4282..2b93b4f65fc 100644 --- a/inventory/sample/group_vars/k8s-cluster/k8s-net-flannel.yml +++ b/inventory/sample/group_vars/k8s-cluster/k8s-net-flannel.yml @@ -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: +# flannel_vxlan_vni: 4096 +# flannel_vxlan_port: 4789 diff --git a/roles/network_plugin/flannel/defaults/main.yml b/roles/network_plugin/flannel/defaults/main.yml index f7f773fdc35..bc6f0aecc46 100644 --- a/roles/network_plugin/flannel/defaults/main.yml +++ b/roles/network_plugin/flannel/defaults/main.yml @@ -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 diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 index c549e080413..7fe23666b16 100644 --- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 +++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 @@ -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 %} } } ---