From ab75bf97ce2d5cb6f87893f9d374a25e453d0f7e Mon Sep 17 00:00:00 2001
From: JoelKle <34544090+JoelKle@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:27:38 +0100
Subject: [PATCH] Fix installer update-ca-trust command

The latest release of the update-ca-trust requires the --output param
if you run as non-root user.

See: https://gitlab.com/redhat/centos-stream/rpms/ca-certificates/-/commit/81a090f89a413487bb8a8677eff9bb4fb8bfbf71
And: https://github.com/ansible/awx-ee/issues/258#issuecomment-2439742296

Fixes: https://github.com/ansible/awx-ee/issues/258
---
 roles/installer/templates/deployments/task.yaml.j2 | 2 +-
 roles/installer/templates/deployments/web.yaml.j2  | 2 +-
 roles/installer/templates/jobs/migration.yaml.j2   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/installer/templates/deployments/task.yaml.j2 b/roles/installer/templates/deployments/task.yaml.j2
index 72140f404..93c1cd130 100644
--- a/roles/installer/templates/deployments/task.yaml.j2
+++ b/roles/installer/templates/deployments/task.yaml.j2
@@ -84,7 +84,7 @@ spec:
             - -c
             - |
               mkdir -p /etc/pki/ca-trust/extracted/{java,pem,openssl,edk2}
-              update-ca-trust extract
+              update-ca-trust extract --output /etc/pki/ca-trust/extracted
           volumeMounts:
             - name: "ca-trust-extracted"
               mountPath: "/etc/pki/ca-trust/extracted"
diff --git a/roles/installer/templates/deployments/web.yaml.j2 b/roles/installer/templates/deployments/web.yaml.j2
index ae0abb782..ec3a3cfe6 100644
--- a/roles/installer/templates/deployments/web.yaml.j2
+++ b/roles/installer/templates/deployments/web.yaml.j2
@@ -91,7 +91,7 @@ spec:
             - -c
             - |
               mkdir -p /etc/pki/ca-trust/extracted/{java,pem,openssl,edk2}
-              update-ca-trust extract
+              update-ca-trust extract --output /etc/pki/ca-trust/extracted
           volumeMounts:
             - name: "ca-trust-extracted"
               mountPath: "/etc/pki/ca-trust/extracted"
diff --git a/roles/installer/templates/jobs/migration.yaml.j2 b/roles/installer/templates/jobs/migration.yaml.j2
index 8c05de592..872095cf1 100644
--- a/roles/installer/templates/jobs/migration.yaml.j2
+++ b/roles/installer/templates/jobs/migration.yaml.j2
@@ -24,7 +24,7 @@ spec:
             - -c
             - |
               mkdir -p /etc/pki/ca-trust/extracted/{java,pem,openssl,edk2}
-              update-ca-trust extract
+              update-ca-trust extract --output /etc/pki/ca-trust/extracted
           volumeMounts:
             - name: "ca-trust-extracted"
               mountPath: "/etc/pki/ca-trust/extracted"