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

make-ssl: resolved merge conflict

Browse source
This commit is contained in:
nhaveric 2017-03-02 17:26:32 +01:00
parent 3843742e30
commit 7c8be652e7
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/kubernetes/secrets/files/make-ssl.sh
View file

@ -96,13 +96,8 @@ if [ -n "$HOSTS" ]; then
cn="${host%%.*}"
# node key
openssl genrsa -out node-${host}-key.pem 2048 > /dev/null 2>&1
<<<<<<< 24b9734e1ae72abeb39d9cef1b6a374867810c46
openssl req -new -key node-${host}-key.pem -out node-${host}.csr -subj "/CN=kube-node-${cn}" > /dev/null 2>&1
openssl x509 -req -in node-${host}.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out node-${host}.pem -days 3650 > /dev/null 2>&1
=======
openssl req -new -key node-${host}-key.pem -out node-${host}.csr -subj "/CN=kube-node-${cn}/O=system:node" > /dev/null 2>&1
openssl x509 -req -in node-${host}.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out node-${host}.pem -days 365 > /dev/null 2>&1
>>>>>>> add system groups to certificates
done
fi