Merge pull request #245 from openinfradev/prepare-etcd

bugfix: remove conflict on second installation

Author: intelliguy

prepare-etcd-secret/templates/job-secret.yaml

@@ -22,10 +22,15 @@ spec:
           --from-file=etcd-ca=/ssl/{{ .Values.etcd.certfile }} \
           --from-file=etcd-client=/ssl/{{ .Values.etcd.client_certfile }} \
           --from-file=etcd-client-key=/ssl/{{ .Values.etcd.client_keyfile }}
+          --dry-run=client \
+          -o yaml |  kubectl apply -f -
       {{- else if eq .Values.deployer "tacoplay" }}
           --from-file=etcd-ca=/ssl/{{ .Values.etcd.tacoplay_certfile }} \
           --from-file=etcd-client=/ssl/member-${MY_NODE_NAME}.pem \
-          --from-file=etcd-client-key=/ssl/member-${MY_NODE_NAME}-key.pem
+          --from-file=etcd-client-key=/ssl/member-${MY_NODE_NAME}-key.pem \
+          --dry-run=client \
+          -o yaml |  kubectl apply -f -
+
         env:
         - name: MY_NODE_NAME
           valueFrom: