a6455a93dc
fix merge conflict |
||
---|---|---|
.. | ||
define-first-kube-control.yml | ||
encrypt-at-rest.yml | ||
kubeadm-backup.yml | ||
kubeadm-etcd.yml | ||
kubeadm-fix-apiserver.yml | ||
kubeadm-secondary.yml | ||
kubeadm-setup.yml | ||
kubeadm-upgrade.yml | ||
kubelet-fix-client-cert-rotation.yml | ||
main.yml | ||
pre-upgrade.yml | ||
psp-install.yml |