From 9f38112cc0e86563022f130b7053045b5d656f2d Mon Sep 17 00:00:00 2001 From: Brad Beam Date: Tue, 16 May 2017 15:28:39 -0500 Subject: [PATCH 1/2] Removing old sysv reference --- roles/kargo-defaults/defaults/main.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/kargo-defaults/defaults/main.yaml b/roles/kargo-defaults/defaults/main.yaml index e1a52f22e..373152a92 100644 --- a/roles/kargo-defaults/defaults/main.yaml +++ b/roles/kargo-defaults/defaults/main.yaml @@ -42,9 +42,6 @@ kube_script_dir: "{{ bin_dir }}/kubernetes-scripts" kube_manifest_dir: "{{ kube_config_dir }}/manifests" system_namespace: kube-system -# Logging directory (sysvinit systems) -kube_log_dir: "/var/log/kubernetes" - # This is where all the cert scripts and certs will be located kube_cert_dir: "{{ kube_config_dir }}/ssl" From db0ff8762c50314c66b46d365b8982a4ccf23e09 Mon Sep 17 00:00:00 2001 From: Brad Beam Date: Tue, 16 May 2017 15:43:29 -0500 Subject: [PATCH 2/2] Fixing typo in kubelet cluster-dns and cluster-domain flags --- roles/kubernetes/node/templates/kubelet.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2 index 8de1e63e9..d2959b8a6 100644 --- a/roles/kubernetes/node/templates/kubelet.j2 +++ b/roles/kubernetes/node/templates/kubelet.j2 @@ -19,13 +19,13 @@ KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}" {# DNS settings for kubelet #} {% if dns_mode == 'kubedns' %} -{% set kubelet_args_cluster_dns %}--cluster_dns={{ skydns_server }}{% endset %} +{% set kubelet_args_cluster_dns %}--cluster-dns={{ skydns_server }}{% endset %} {% elif dns_mode == 'dnsmasq_kubedns' %} -{% set kubelet_args_cluster_dns %}--cluster_dns={{ dns_server }}{% endset %} +{% set kubelet_args_cluster_dns %}--cluster-dns={{ dns_server }}{% endset %} {% else %} {% set kubelet_args_cluster_dns %}{% endset %} {% endif %} -{% set kubelet_args_dns %}{{ kubelet_args_cluster_dns }} --cluster_domain={{ dns_domain }} --resolv-conf={{ kube_resolv_conf }}{% endset %} +{% set kubelet_args_dns %}{{ kubelet_args_cluster_dns }} --cluster-domain={{ dns_domain }} --resolv-conf={{ kube_resolv_conf }}{% endset %} {# Location of the apiserver #} {% set kubelet_args_kubeconfig %}--kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --require-kubeconfig{% endset %}