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

Add subjectAltName to calico-apiserver certificate (#8907)

Browse source 
* Add AltName to calico-apiserver certificate

* fix support for centos7 openssl
This commit is contained in:
vanyasvl 2022-06-06 17:38:23 +03:00 committed by GitHub
parent b2346cdaec
commit a4f752fb02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roles/network_plugin/calico/files/openssl.conf
View file

@ -18,3 +18,10 @@ basicConstraints = CA:TRUE
keyUsage = cRLSign, digitalSignature, keyCertSign keyUsage = cRLSign, digitalSignature, keyCertSign
subjectKeyIdentifier=hash subjectKeyIdentifier=hash
authorityKeyIdentifier=keyid:always,issuer authorityKeyIdentifier=keyid:always,issuer
[ ssl_client_apiserver ]
extendedKeyUsage = clientAuth, serverAuth
basicConstraints = CA:FALSE
subjectKeyIdentifier=hash
authorityKeyIdentifier=keyid,issuer
subjectAltName = DNS:calico-api.calico-apiserver.svc

2
roles/network_plugin/calico/templates/make-ssl-calico.sh.j2
View file

@ -87,7 +87,7 @@ elif [ $SERVICE == "apiserver" ]; then
# calico-apiserver # calico-apiserver
openssl genrsa -out apiserver.key {{certificates_key_size}} > /dev/null 2>&1 openssl genrsa -out apiserver.key {{certificates_key_size}} > /dev/null 2>&1
openssl req -new -key apiserver.key -out apiserver.csr -subj "/CN=calico-apiserver" -config ${CONFIG} > /dev/null 2>&1 openssl req -new -key apiserver.key -out apiserver.csr -subj "/CN=calico-apiserver" -config ${CONFIG} > /dev/null 2>&1
openssl x509 -req -in apiserver.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out apiserver.crt -days {{certificates_duration}} -extensions ssl_client -extfile ${CONFIG} > /dev/null 2>&1 openssl x509 -req -in apiserver.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out apiserver.crt -days {{certificates_duration}} -extensions ssl_client_apiserver -extfile ${CONFIG} > /dev/null 2>&1
else else
echo "ERROR: the openssl configuration file is missing. option -s" echo "ERROR: the openssl configuration file is missing. option -s"
exit 1 exit 1