diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 65f0386518ee7a59ff576286ea9524e62a657c4e..ca1ffe2e4a8b8f1daafc3025f9cdd6bb0ba39243 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 @@ -118,7 +118,7 @@ controllerManagerExtraArgs: {% for key in kube_kubeadm_controller_extra_args %} {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" {% 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: - name: openstackcacert hostPath: "{{ kube_config_dir }}/openstack-cacert.pem" diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index bb1d9b9a43e5b43e564390dd20e70696c72edb68..0807d8ee2cebbc408a79a2b30ac832c2694eaefa 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 @@ -117,7 +117,7 @@ controllerManagerExtraArgs: {% for key in kube_kubeadm_controller_extra_args %} {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" {% 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: - name: openstackcacert hostPath: "{{ kube_config_dir }}/openstack-cacert.pem" 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 848a65a5939cdfa169b52d35f268c1dfe2531d1f..ac7dbd2ecd9a95d6c85e2a554c3fda84965b9bb1 100644 --- a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 @@ -97,7 +97,7 @@ spec: name: cloudconfig readOnly: true {% 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" name: openstackcacert readOnly: true @@ -122,7 +122,7 @@ spec: path: "{{ kube_config_dir }}/cloud_config" name: cloudconfig {% 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: path: "{{ kube_config_dir }}/openstack-cacert.pem" name: openstackcacert diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml index 03d08bb1ac14383c07edf2978f8d15f33fc6a65a..db9cbd3090f2de5462611cc5c74469a53a3fdda5 100644 --- a/roles/kubernetes/node/tasks/main.yml +++ b/roles/kubernetes/node/tasks/main.yml @@ -177,6 +177,7 @@ - cloud_provider is defined - cloud_provider == 'openstack' - openstack_cacert is defined + - openstack_cacert != "" tags: - cloud-provider