Merge pull request #648 from WASdev/port-fix-issue-645

Merge main into vNext

Author: leochr

ga/24.0.0.11/kernel/helpers/runtime/docker-server.sh

@@ -61,7 +61,7 @@ function importKeyCert() {
   # Add kubernetes CA certificates to the truststore
   # CA bundles need to be split and added as individual certificates
   if [ "$SEC_IMPORT_K8S_CERTS" = "true" ] && [ -d "${KUBE_SA_FOLDER}" ]; then
-    mkdir /tmp/certs
+    mkdir -p /tmp/certs
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'

ga/24.0.0.6/kernel/helpers/runtime/docker-server.sh

@@ -61,7 +61,7 @@ function importKeyCert() {
   # Add kubernetes CA certificates to the truststore
   # CA bundles need to be split and added as individual certificates
   if [ "$SEC_IMPORT_K8S_CERTS" = "true" ] && [ -d "${KUBE_SA_FOLDER}" ]; then
-    mkdir /tmp/certs
+    mkdir -p /tmp/certs
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'

ga/24.0.0.9/kernel/helpers/runtime/docker-server.sh

@@ -61,7 +61,7 @@ function importKeyCert() {
   # Add kubernetes CA certificates to the truststore
   # CA bundles need to be split and added as individual certificates
   if [ "$SEC_IMPORT_K8S_CERTS" = "true" ] && [ -d "${KUBE_SA_FOLDER}" ]; then
-    mkdir /tmp/certs
+    mkdir -p /tmp/certs
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'

ga/latest/kernel/helpers/runtime/docker-server.sh

@@ -61,7 +61,7 @@ function importKeyCert() {
   # Add kubernetes CA certificates to the truststore
   # CA bundles need to be split and added as individual certificates
   if [ "$SEC_IMPORT_K8S_CERTS" = "true" ] && [ -d "${KUBE_SA_FOLDER}" ]; then
-    mkdir /tmp/certs
+    mkdir -p /tmp/certs
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'