From ef703e49fc6802c5aa3e80af2b3904dca100fcb4 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Sat, 16 Sep 2017 09:46:58 +0100 Subject: [PATCH] Re-enable GCE cloud provider --- roles/kubernetes/master/templates/kubeadm-config.yaml.j2 | 1 - .../master/templates/manifests/kube-apiserver.manifest.j2 | 4 ++-- .../manifests/kube-controller-manager.manifest.j2 | 8 ++++---- roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 | 4 ++-- roles/kubernetes/node/templates/kubelet.standard.env.j2 | 4 ++-- roles/kubernetes/preinstall/tasks/main.yml | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/roles/kubernetes/master/templates/kubeadm-config.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.yaml.j2 index 7e906efa9..e9ace112a 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.yaml.j2 @@ -17,7 +17,6 @@ networking: podSubnet: {{ kube_pods_subnet }} kubernetesVersion: {{ kube_version }} cloudProvider: {{ cloud_provider|default('') }} -#TODO: cloud provider conf file authorizationModes: - Node {% for mode in authorization_modes %} diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index 58c762961..1271c8ce7 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -77,8 +77,8 @@ spec: - --allow-privileged=true {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} - --cloud-provider={{ cloud_provider }} - - --cloud-config={{ kube_config_dir }}/cloud_config -{% elif cloud_provider is defined and cloud_provider == "aws" %} + - --cloud-config={{ kube_config_dir }}/cloud-config +{% elif cloud_provider is defined %} - --cloud-provider={{ cloud_provider }} {% endif %} {% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %} diff --git a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 index bf03e6040..64f698d4e 100644 --- a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 @@ -43,8 +43,8 @@ spec: {% endif %} {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} - --cloud-provider={{cloud_provider}} - - --cloud-config={{ kube_config_dir }}/cloud_config -{% elif cloud_provider is defined and cloud_provider == "aws" %} + - --cloud-config={{ kube_config_dir }}/cloud-config +{% elif cloud_provider is defined %} - --cloud-provider={{cloud_provider}} {% endif %} {% if kube_network_plugin is defined and kube_network_plugin == 'cloud' %} @@ -88,7 +88,7 @@ spec: name: kubeconfig readOnly: true {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere" ] %} - - mountPath: "{{ kube_config_dir }}/cloud_config" + - mountPath: "{{ kube_config_dir }}/cloud-config" name: cloudconfig readOnly: true {% endif %} @@ -109,6 +109,6 @@ spec: path: "{{ kube_config_dir }}/kube-controller-manager-kubeconfig.yaml" {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} - hostPath: - path: "{{ kube_config_dir }}/cloud_config" + path: "{{ kube_config_dir }}/cloud-config" name: cloudconfig {% endif %} diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 index 236b40b5c..9e9e07b14 100644 --- a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 @@ -48,8 +48,8 @@ KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kuben # Should this cluster be allowed to run privileged docker containers KUBE_ALLOW_PRIV="--allow-privileged=true" {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} -KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud_config" -{% elif cloud_provider is defined and cloud_provider == "aws" %} +KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud-config" +{% elif cloud_provider is defined %} KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}" {% else %} KUBELET_CLOUDPROVIDER="" diff --git a/roles/kubernetes/node/templates/kubelet.standard.env.j2 b/roles/kubernetes/node/templates/kubelet.standard.env.j2 index 3240b5611..eca9ed01a 100644 --- a/roles/kubernetes/node/templates/kubelet.standard.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.standard.env.j2 @@ -66,8 +66,8 @@ KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kuben # Should this cluster be allowed to run privileged docker containers KUBE_ALLOW_PRIV="--allow-privileged=true" {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} -KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud_config" -{% elif cloud_provider is defined and cloud_provider == "aws" %} +KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud-config" +{% elif cloud_provider is defined %} KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}" {% else %} KUBELET_CLOUDPROVIDER="" diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml index 38a329781..e3cb3602f 100644 --- a/roles/kubernetes/preinstall/tasks/main.yml +++ b/roles/kubernetes/preinstall/tasks/main.yml @@ -193,7 +193,7 @@ - name: Write cloud-config template: src: "{{ cloud_provider }}-cloud-config.j2" - dest: "{{ kube_config_dir }}/cloud_config" + dest: "{{ kube_config_dir }}/cloud-config" group: "{{ kube_cert_group }}" mode: 0640 when: