Merge pull request #11 from rfranzke/rel-v3.4.13-bootstrap

[rel-v3.4.13-bootstrap] Consider all files in `/var/etcd/ssl/ca/` for root CAs
gardener · Mar 23, 2022 · 9d907d6 · 9d907d6
2 parents 304b6f0 + 4594316
commit 9d907d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v3.4.13-bootstrap-1
+v3.4.13-bootstrap-2
diff --git a/etcd_bootstrap_script.sh b/etcd_bootstrap_script.sh
@@ -5,7 +5,7 @@ VALIDATION_MARKER=/var/etcd/data/validation_marker
 # Add self-signed CA to list of root CA-certificates
 if [ $ENABLE_TLS = 'true' ]
 then
-  cat /var/etcd/ssl/ca/ca.crt >> /etc/ssl/certs/ca-certificates.crt
+  cat /var/etcd/ssl/ca/* >> /etc/ssl/certs/ca-certificates.crt
   if [ $? -ne 0 ]
   then
     echo "failed to update root certificate list"