From 6ffa138ab120e01031367eda542547651bad6aab Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Fri, 16 Aug 2019 21:49:56 +0200 Subject: [PATCH] Update Kubespray to v2.10.4 --- ansible.cfg | 1 + group_vars/k8s-cluster.yml | 8 +++----- inventories/prod/group_vars/k8s-cluster.yml | 2 -- inventories/test/group_vars/k8s-cluster.yml | 2 -- kubespray | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index cda1585..ec2aed7 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -8,6 +8,7 @@ remote_user = root retry_files_enabled = False library = kubespray/library/ roles_path = kubespray/roles/ +invalid_task_attribute_failed=False [ssh_connection] control_path = /tmp/ansible-ssh-%%h-%%p-%%r diff --git a/group_vars/k8s-cluster.yml b/group_vars/k8s-cluster.yml index bd5e07c..2231738 100644 --- a/group_vars/k8s-cluster.yml +++ b/group_vars/k8s-cluster.yml @@ -4,11 +4,9 @@ kube_network_plugin: flannel bin_dir: /usr/local/bin kube_config_dir: "/etc/kubernetes" +upstream_dns_servers: + - 195.20.55.180 + #Addons kube_api_anonymous_auth: true -ingress_nginx_enabled: true -ingress_nginx_host_network: true -ingress_nginx_nodeselector: - node-role.kubernetes.io/node: "" -cert_manager_enabled: true metrics_server_enabled: true diff --git a/inventories/prod/group_vars/k8s-cluster.yml b/inventories/prod/group_vars/k8s-cluster.yml index cc3970a..0138b20 100644 --- a/inventories/prod/group_vars/k8s-cluster.yml +++ b/inventories/prod/group_vars/k8s-cluster.yml @@ -1,4 +1,2 @@ --- -cluster_name: banditlair -dns_domain: banditlair.com default_issuer: letsencrypt-production diff --git a/inventories/test/group_vars/k8s-cluster.yml b/inventories/test/group_vars/k8s-cluster.yml index e534b04..c079edf 100644 --- a/inventories/test/group_vars/k8s-cluster.yml +++ b/inventories/test/group_vars/k8s-cluster.yml @@ -1,4 +1,2 @@ --- -cluster_name: banditlair-test -dns_domain: test.k8s.banditlair.com default_issuer: letsencrypt-staging diff --git a/kubespray b/kubespray index d53782a..7d8da83 160000 --- a/kubespray +++ b/kubespray @@ -1 +1 @@ -Subproject commit d53782a7f1791d46c0e3779cbc9a258ad492c2b9 +Subproject commit 7d8da8348e095a5f0b160c1e05c4c399d201d1f0