Merge pull request #3204 from riverzhang/fix-copy-ssl-ca

Fix copy etcd-ssl-ca failed
This commit is contained in:
k8s-ci-robot 2018-08-31 02:00:01 -07:00 committed by GitHub
commit c87a373c53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -97,14 +97,6 @@
kubeadm_config_api_fqdn: "{{ apiserver_loadbalancer_domain_name|default('lb-apiserver.kubernetes.local') }}" kubeadm_config_api_fqdn: "{{ apiserver_loadbalancer_domain_name|default('lb-apiserver.kubernetes.local') }}"
when: loadbalancer_apiserver is defined when: loadbalancer_apiserver is defined
- name: kubeadm | Copy etcd ca file as k8s ca
command: "cp -T {{ etcd_cert_dir }}/ca.pem {{ kube_config_dir }}/ssl/etcd/ca.crt"
changed_when: false
- name: kubeadm | Copy etcd cakey as k8s cakey
command: "cp -T {{ etcd_cert_dir }}/ca-key.pem {{ kube_config_dir }}/ssl/etcd/ca.key"
changed_when: false
- name: kubeadm | Create kubeadm config - name: kubeadm | Create kubeadm config
template: template:
src: "kubeadm-config.{{ kubeadmConfig_api_version }}.yaml.j2" src: "kubeadm-config.{{ kubeadmConfig_api_version }}.yaml.j2"