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

Merge pull request #3280 from wozniakjan/openstack/openstack_cacert

Browse source 
Check `openstack_cacert` for empty string
This commit is contained in:
k8s-ci-robot 2018-09-19 22:42:37 -07:00 committed by GitHub
commit 8512cc5cca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ controllerManagerExtraArgs:
{% for key in kube_kubeadm_controller_extra_args %} {% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}"
{% endfor %} {% endfor %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
controllerManagerExtraVolumes: controllerManagerExtraVolumes:
- name: openstackcacert - name: openstackcacert
hostPath: "{{ kube_config_dir }}/openstack-cacert.pem" hostPath: "{{ kube_config_dir }}/openstack-cacert.pem"

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

@ -117,7 +117,7 @@ controllerManagerExtraArgs:
{% for key in kube_kubeadm_controller_extra_args %} {% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}"
{% endfor %} {% endfor %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
controllerManagerExtraVolumes: controllerManagerExtraVolumes:
- name: openstackcacert - name: openstackcacert
hostPath: "{{ kube_config_dir }}/openstack-cacert.pem" hostPath: "{{ kube_config_dir }}/openstack-cacert.pem"

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

@ -97,7 +97,7 @@ spec:
name: cloudconfig name: cloudconfig
readOnly: true readOnly: true
{% endif %} {% endif %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
- mountPath: "{{ kube_config_dir }}/openstack-cacert.pem" - mountPath: "{{ kube_config_dir }}/openstack-cacert.pem"
name: openstackcacert name: openstackcacert
readOnly: true readOnly: true
@ -122,7 +122,7 @@ spec:
path: "{{ kube_config_dir }}/cloud_config" path: "{{ kube_config_dir }}/cloud_config"
name: cloudconfig name: cloudconfig
{% endif %} {% endif %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
- hostPath: - hostPath:
path: "{{ kube_config_dir }}/openstack-cacert.pem" path: "{{ kube_config_dir }}/openstack-cacert.pem"
name: openstackcacert name: openstackcacert

1
roles/kubernetes/node/tasks/main.yml
View file

@ -177,6 +177,7 @@
- cloud_provider is defined - cloud_provider is defined
- cloud_provider == 'openstack' - cloud_provider == 'openstack'
- openstack_cacert is defined - openstack_cacert is defined
- openstack_cacert != ""
tags: tags:
- cloud-provider - cloud-provider