Skip to content

Commit a921ff9

Browse files
fix: NODE_EXTRA_CA_CERTS condition
1 parent 268e50d commit a921ff9

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

entrypoint.sh

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,25 @@ if [[ $ANALYTICS_ENABLED != "false" ]]; then
2626
fi
2727

2828
if [[ -z "${NODE_EXTRA_CA_CERTS}" ]]; then
29-
# Copy the Kube API and service CA bundle to /opt/app-root/src/ca.crt if they exist
30-
31-
# Add Kube API CA
32-
if [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
33-
cp /var/run/secrets/kubernetes.io/serviceaccount/ca.crt ${NODE_EXTRA_CA_CERTS}
34-
fi
35-
36-
# Add service serving CA
37-
if [ -f "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt" ]; then
38-
cat /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt >>${NODE_EXTRA_CA_CERTS}
39-
fi
40-
41-
# Add custom ingress CA if it exists
42-
if [ -f "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" ]; then
43-
cat /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem >>${NODE_EXTRA_CA_CERTS}
44-
fi
29+
# Nothing to do
30+
echo "No NODE_EXTRA_CA_CERTS found"
31+
else
32+
# Copy the Kube API and service CA bundle to /opt/app-root/src/ca.crt if they exist
33+
34+
# Add Kube API CA
35+
if [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
36+
cp /var/run/secrets/kubernetes.io/serviceaccount/ca.crt ${NODE_EXTRA_CA_CERTS}
37+
fi
38+
39+
# Add service serving CA
40+
if [ -f "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt" ]; then
41+
cat /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt >>${NODE_EXTRA_CA_CERTS}
42+
fi
43+
44+
# Add custom ingress CA if it exists
45+
if [ -f "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" ]; then
46+
cat /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem >>${NODE_EXTRA_CA_CERTS}
47+
fi
4548
fi
4649

4750
exec node --enable-source-maps server/dist/index.js

0 commit comments

Comments
 (0)