C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Re-enable GCE cloud provider

Browse source
This commit is contained in:
Matthew Mosesohn 2017-09-16 09:46:58 +01:00
parent 0aab3c97a0
commit ef703e49fc
6 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
View file

@ -17,7 +17,6 @@ networking:
podSubnet: {{ kube_pods_subnet }} podSubnet: {{ kube_pods_subnet }}
kubernetesVersion: {{ kube_version }} kubernetesVersion: {{ kube_version }}
cloudProvider: {{ cloud_provider|default('') }} cloudProvider: {{ cloud_provider|default('') }}
#TODO: cloud provider conf file
authorizationModes: authorizationModes:
- Node - Node
{% for mode in authorization_modes %} {% for mode in authorization_modes %}

4
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View file

@ -77,8 +77,8 @@ spec:
- --allow-privileged=true - --allow-privileged=true
{% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %}
- --cloud-provider={{ cloud_provider }} - --cloud-provider={{ cloud_provider }}
- --cloud-config={{ kube_config_dir }}/cloud_config - --cloud-config={{ kube_config_dir }}/cloud-config
{% elif cloud_provider is defined and cloud_provider == "aws" %} {% elif cloud_provider is defined %}
- --cloud-provider={{ cloud_provider }} - --cloud-provider={{ cloud_provider }}
{% endif %} {% endif %}
{% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %} {% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %}

8
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View file

@ -43,8 +43,8 @@ spec:
{% endif %} {% endif %}
{% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %}
- --cloud-provider={{cloud_provider}} - --cloud-provider={{cloud_provider}}
- --cloud-config={{ kube_config_dir }}/cloud_config - --cloud-config={{ kube_config_dir }}/cloud-config
{% elif cloud_provider is defined and cloud_provider == "aws" %} {% elif cloud_provider is defined %}
- --cloud-provider={{cloud_provider}} - --cloud-provider={{cloud_provider}}
{% endif %} {% endif %}
{% if kube_network_plugin is defined and kube_network_plugin == 'cloud' %} {% if kube_network_plugin is defined and kube_network_plugin == 'cloud' %}
@ -88,7 +88,7 @@ spec:
name: kubeconfig name: kubeconfig
readOnly: true readOnly: true
{% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere" ] %} {% 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 name: cloudconfig
readOnly: true readOnly: true
{% endif %} {% endif %}
@ -109,6 +109,6 @@ spec:
path: "{{ kube_config_dir }}/kube-controller-manager-kubeconfig.yaml" path: "{{ kube_config_dir }}/kube-controller-manager-kubeconfig.yaml"
{% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %}
- hostPath: - hostPath:
path: "{{ kube_config_dir }}/cloud_config" path: "{{ kube_config_dir }}/cloud-config"
name: cloudconfig name: cloudconfig
{% endif %} {% endif %}

4
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
View file

@ -48,8 +48,8 @@ KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kuben
# Should this cluster be allowed to run privileged docker containers # Should this cluster be allowed to run privileged docker containers
KUBE_ALLOW_PRIV="--allow-privileged=true" KUBE_ALLOW_PRIV="--allow-privileged=true"
{% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} {% 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" KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud-config"
{% elif cloud_provider is defined and cloud_provider == "aws" %} {% elif cloud_provider is defined %}
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}" KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}"
{% else %} {% else %}
KUBELET_CLOUDPROVIDER="" KUBELET_CLOUDPROVIDER=""

4
roles/kubernetes/node/templates/kubelet.standard.env.j2
View file

@ -66,8 +66,8 @@ KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kuben
# Should this cluster be allowed to run privileged docker containers # Should this cluster be allowed to run privileged docker containers
KUBE_ALLOW_PRIV="--allow-privileged=true" KUBE_ALLOW_PRIV="--allow-privileged=true"
{% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} {% 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" KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud-config"
{% elif cloud_provider is defined and cloud_provider == "aws" %} {% elif cloud_provider is defined %}
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}" KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}"
{% else %} {% else %}
KUBELET_CLOUDPROVIDER="" KUBELET_CLOUDPROVIDER=""

2
roles/kubernetes/preinstall/tasks/main.yml
View file

@ -193,7 +193,7 @@
- name: Write cloud-config - name: Write cloud-config
template: template:
src: "{{ cloud_provider }}-cloud-config.j2" src: "{{ cloud_provider }}-cloud-config.j2"
dest: "{{ kube_config_dir }}/cloud_config" dest: "{{ kube_config_dir }}/cloud-config"
group: "{{ kube_cert_group }}" group: "{{ kube_cert_group }}"
mode: 0640 mode: 0640
when: when: