Skip to content

Commit 543e566

Browse files
authored
Merge pull request #663 from ansible/goneri/mcpserver-use-ca-certificates-instead-of-certifi_15698
mcpserver: use ca-certificates instead of certifi
2 parents 4a83e46 + 3a307ee commit 543e566

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

roles/mcpserver/templates/mcpserver.deployment.yaml.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ spec:
7676
echo "SSL Manager: Extracting system CA trust files..."
7777
update-ca-trust extract --output /etc/pki/ca-trust/extracted
7878

79-
# Now use the extracted system CAs from certifi/ca-trust
80-
echo "SSL Manager: Adding system CAs from certifi..."
81-
python3 -c "import certifi; print(certifi.where())" | xargs cat > /etc/ssl/combined-ca/ca-bundle.crt
79+
# Now use the extracted system CAs from ca-trust
80+
cp -v /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/ssl/combined-ca/ca-bundle.crt
8281
{% if is_openshift %}
8382
# Add OpenShift service CA
8483
if [ -f /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt ]; then

0 commit comments

Comments
 (0)