From c5d24092335ac5c11f49ed19bac300dd0e575638 Mon Sep 17 00:00:00 2001
From: Pavol Pitonak <ppitonak@redhat.com>
Date: Mon, 4 May 2026 16:35:28 +0200
Subject: [PATCH] fix(tkn): sync backed-url param in AWS and Azure Tekton tasks

Signed-off-by: Pavol Pitonak <ppitonak@redhat.com>
---
 Makefile                                      | 1 +
 tkn/infra-aws-ocp-snc.yaml                    | 2 +-
 tkn/infra-azure-aks.yaml                      | 6 +++---
 tkn/infra-azure-fedora.yaml                   | 2 +-
 tkn/infra-azure-rhel-ai.yaml                  | 4 ++--
 tkn/infra-azure-rhel.yaml                     | 2 +-
 tkn/infra-azure-windows-desktop.yaml          | 2 +-
 tkn/template/infra-aws-eks.yaml               | 1 +
 tkn/template/infra-azure-aks.yaml             | 4 ++--
 tkn/template/infra-azure-fedora.yaml          | 2 +-
 tkn/template/infra-azure-rhel-ai.yaml         | 4 ++--
 tkn/template/infra-azure-rhel.yaml            | 2 +-
 tkn/template/infra-azure-windows-desktop.yaml | 2 +-
 13 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 9a8ba3c81..e75cf33eb 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ include tools/tools.mk
 # Functions
 define tkn_update
 	rm tkn/*.yaml 
+	sed -e 's%<IMAGE>%$(1)%g' -e 's%<VERSION>%$(2)%g' tkn/template/infra-aws-eks.yaml > tkn/infra-aws-eks.yaml
 	sed -e 's%<IMAGE>%$(1)%g' -e 's%<VERSION>%$(2)%g' tkn/template/infra-aws-fedora.yaml > tkn/infra-aws-fedora.yaml
 	sed -e 's%<IMAGE>%$(1)%g' -e 's%<VERSION>%$(2)%g' tkn/template/infra-aws-mac.yaml > tkn/infra-aws-mac.yaml
 	sed -e 's%<IMAGE>%$(1)%g' -e 's%<VERSION>%$(2)%g' tkn/template/infra-aws-rhel.yaml > tkn/infra-aws-rhel.yaml
diff --git a/tkn/infra-aws-ocp-snc.yaml b/tkn/infra-aws-ocp-snc.yaml
index 886dad344..6d3b8ddf8 100644
--- a/tkn/infra-aws-ocp-snc.yaml
+++ b/tkn/infra-aws-ocp-snc.yaml
@@ -126,7 +126,7 @@ spec:
       description: If this flag is set it will skip the checks for the cluster readiness. In this case the kubeconfig can not be generated.
       default: 'false'
     - name: profile
-      description: Comma-separated list of profiles to install on the cluster (e.g. virtualization, serverless-serving, serverless-eventing, serverless, servicemesh, ai, nvidia). When virtualization is selected, a bare metal instance is used. The nvidia profile installs NFD and the NVIDIA GPU Operator.
+      description: Comma-separated list of profiles to install on the cluster (e.g. virtualization, serverless-serving, serverless-eventing, serverless, servicemesh, ai). When virtualization is selected, a bare metal instance is used.
       default: "''"
 
     # Network params
diff --git a/tkn/infra-azure-aks.yaml b/tkn/infra-azure-aks.yaml
index 549ad8c20..b56876f14 100644
--- a/tkn/infra-azure-aks.yaml
+++ b/tkn/infra-azure-aks.yaml
@@ -115,7 +115,7 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print masked credentials
         (showing first and last character with *** in the middle) on stdout to help with debugging
       default: 'false'
-    
+
   results:
     - name: cluster-access-secret
       description: |
@@ -184,11 +184,11 @@ spec:
             echo "Parameter ownerName and ownerUid is recommended when creating instance"
           fi
         fi
-        
+
         # Run mapt
         cmd="mapt azure aks $(params.operation) "
         cmd+="--project-name mapt-aks-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/aks-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/aks/$(params.id) "
 
         if [[ $(params.debug) == "true" ]]; then
           cmd+="--debug "
diff --git a/tkn/infra-azure-fedora.yaml b/tkn/infra-azure-fedora.yaml
index 6177db3a6..3abe601a0 100644
--- a/tkn/infra-azure-fedora.yaml
+++ b/tkn/infra-azure-fedora.yaml
@@ -212,7 +212,7 @@ spec:
         # Run mapt
         cmd="mapt azure fedora $(params.operation) "
         cmd+="--project-name mapt-fedora-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/fedora-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/fedora/$(params.id) "
 
         if [[ "$(params.debug)" == "true" ]]; then
           cmd+="--debug "
diff --git a/tkn/infra-azure-rhel-ai.yaml b/tkn/infra-azure-rhel-ai.yaml
index 2d99e0c04..bbb0104c5 100644
--- a/tkn/infra-azure-rhel-ai.yaml
+++ b/tkn/infra-azure-rhel-ai.yaml
@@ -211,7 +211,7 @@ spec:
         # Run mapt
         cmd="mapt azure rhel-ai $(params.operation) "
         cmd+="--project-name mapt-rhel-ai-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/rhel-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/rhel-ai/$(params.id) "
 
         if [[ "$(params.debug)" == "true" ]]; then
           cmd+="--debug "
@@ -310,4 +310,4 @@ spec:
         
         NAME=$(oc create -f host-info.yaml -o=jsonpath='{.metadata.name}')
         echo -n "${NAME}" | tee $(results.host-access-secret.path)   
-        fi
\ No newline at end of file
+        fi
diff --git a/tkn/infra-azure-rhel.yaml b/tkn/infra-azure-rhel.yaml
index 80262c3a0..5dc3ab131 100644
--- a/tkn/infra-azure-rhel.yaml
+++ b/tkn/infra-azure-rhel.yaml
@@ -216,7 +216,7 @@ spec:
         # Run mapt
         cmd="mapt azure rhel $(params.operation) "
         cmd+="--project-name mapt-rhel-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/rhel-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/rhel/$(params.id) "
 
         if [[ "$(params.debug)" == "true" ]]; then
           cmd+="--debug "
diff --git a/tkn/infra-azure-windows-desktop.yaml b/tkn/infra-azure-windows-desktop.yaml
index 4d64766a7..6d4e343d6 100644
--- a/tkn/infra-azure-windows-desktop.yaml
+++ b/tkn/infra-azure-windows-desktop.yaml
@@ -205,7 +205,7 @@ spec:
         # Run mapt
         cmd="mapt azure windows $(params.operation) "
         cmd+="--project-name mapt-windows-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/windows-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/windows/$(params.id) "
 
         if [[ $(params.debug) == "true" ]]; then
           cmd+="--debug "
diff --git a/tkn/template/infra-aws-eks.yaml b/tkn/template/infra-aws-eks.yaml
index 961e74801..e27754a7e 100644
--- a/tkn/template/infra-aws-eks.yaml
+++ b/tkn/template/infra-aws-eks.yaml
@@ -41,6 +41,7 @@ spec:
           secret-key: ${secret_key}
           region: ${region}
           bucket: ${bucket}
+
     # Mapt params
     - name: id
       description: identifier for the provisioned environment
diff --git a/tkn/template/infra-azure-aks.yaml b/tkn/template/infra-azure-aks.yaml
index 2c5fcb6c8..8ce334447 100644
--- a/tkn/template/infra-azure-aks.yaml
+++ b/tkn/template/infra-azure-aks.yaml
@@ -188,7 +188,7 @@ spec:
         # Run mapt
         cmd="mapt azure aks $(params.operation) "
         cmd+="--project-name mapt-aks-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/aks-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/aks/$(params.id) "
 
         if [[ $(params.debug) == "true" ]]; then
           cmd+="--debug "
@@ -226,7 +226,7 @@ spec:
         - name: OWNER_NAME
           value: $(params.ownerName)
         - name: OWNER_UID
-          value: $(params.ownerUid)  
+          value: $(params.ownerUid)
       volumeMounts:
         - name: cluster-info
           mountPath: /opt/cluster-info
diff --git a/tkn/template/infra-azure-fedora.yaml b/tkn/template/infra-azure-fedora.yaml
index f04a70641..4e759e958 100644
--- a/tkn/template/infra-azure-fedora.yaml
+++ b/tkn/template/infra-azure-fedora.yaml
@@ -212,7 +212,7 @@ spec:
         # Run mapt
         cmd="mapt azure fedora $(params.operation) "
         cmd+="--project-name mapt-fedora-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/fedora-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/fedora/$(params.id) "
 
         if [[ "$(params.debug)" == "true" ]]; then
           cmd+="--debug "
diff --git a/tkn/template/infra-azure-rhel-ai.yaml b/tkn/template/infra-azure-rhel-ai.yaml
index 977b3c0e5..548bba0bb 100644
--- a/tkn/template/infra-azure-rhel-ai.yaml
+++ b/tkn/template/infra-azure-rhel-ai.yaml
@@ -211,7 +211,7 @@ spec:
         # Run mapt
         cmd="mapt azure rhel-ai $(params.operation) "
         cmd+="--project-name mapt-rhel-ai-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/rhel-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/rhel-ai/$(params.id) "
 
         if [[ "$(params.debug)" == "true" ]]; then
           cmd+="--debug "
@@ -310,4 +310,4 @@ spec:
         
         NAME=$(oc create -f host-info.yaml -o=jsonpath='{.metadata.name}')
         echo -n "${NAME}" | tee $(results.host-access-secret.path)   
-        fi
\ No newline at end of file
+        fi
diff --git a/tkn/template/infra-azure-rhel.yaml b/tkn/template/infra-azure-rhel.yaml
index 1935cc342..27e43709e 100644
--- a/tkn/template/infra-azure-rhel.yaml
+++ b/tkn/template/infra-azure-rhel.yaml
@@ -216,7 +216,7 @@ spec:
         # Run mapt
         cmd="mapt azure rhel $(params.operation) "
         cmd+="--project-name mapt-rhel-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/rhel-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/rhel/$(params.id) "
 
         if [[ "$(params.debug)" == "true" ]]; then
           cmd+="--debug "
diff --git a/tkn/template/infra-azure-windows-desktop.yaml b/tkn/template/infra-azure-windows-desktop.yaml
index 9d5a7d747..6f4be1055 100644
--- a/tkn/template/infra-azure-windows-desktop.yaml
+++ b/tkn/template/infra-azure-windows-desktop.yaml
@@ -205,7 +205,7 @@ spec:
         # Run mapt
         cmd="mapt azure windows $(params.operation) "
         cmd+="--project-name mapt-windows-$(params.id) "
-        cmd+="--backed-url azblob://${BLOB}/windows-$(params.id) "
+        cmd+="--backed-url azblob://${BLOB}/mapt/windows/$(params.id) "
 
         if [[ $(params.debug) == "true" ]]; then
           cmd+="--debug "