fix: allow to set architecture also when compute-sizes are defined

previously architecture could only be configured when compute-sizes were not defined

Signed-off-by: Pavol Pitonak <ppitonak@redhat.com>

Author: ppitonak

tkn/infra-aws-fedora.yaml

@@ -236,7 +236,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch '$(params.arch)' "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -245,6 +244,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ -f /opt/rh-account-secret/user ]]; then
             cmd+="--rh-subscription-username '$(cat /opt/rh-account-secret/user)' "

tkn/infra-aws-rhel.yaml

@@ -258,7 +258,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch '$(params.arch)' "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -267,6 +266,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ -f /opt/rh-account-secret/user ]]; then
             cmd+="--rh-subscription-username '$(cat /opt/rh-account-secret/user)' "

tkn/infra-azure-fedora.yaml

@@ -223,7 +223,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch $(params.arch) "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -232,6 +231,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ "$(params.spot)" == "true" ]]; then
             cmd+="--spot "

tkn/infra-azure-rhel.yaml

@@ -227,7 +227,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch '$(params.arch)' "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -236,6 +235,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ "$(params.spot)" == "true" ]]; then
             cmd+="--spot "

tkn/template/infra-aws-fedora.yaml

@@ -236,7 +236,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch '$(params.arch)' "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -245,6 +244,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ -f /opt/rh-account-secret/user ]]; then
             cmd+="--rh-subscription-username '$(cat /opt/rh-account-secret/user)' "

tkn/template/infra-aws-rhel.yaml

@@ -258,7 +258,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch '$(params.arch)' "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -267,6 +266,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ -f /opt/rh-account-secret/user ]]; then
             cmd+="--rh-subscription-username '$(cat /opt/rh-account-secret/user)' "

tkn/template/infra-azure-fedora.yaml

@@ -223,7 +223,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch $(params.arch) "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -232,6 +231,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ "$(params.spot)" == "true" ]]; then
             cmd+="--spot "

tkn/template/infra-azure-rhel.yaml

@@ -227,7 +227,6 @@ spec:
           if [[ "$(params.compute-sizes)" != "" ]]; then
             cmd+="--compute-sizes '$(params.compute-sizes)' "
           else
-            cmd+="--arch '$(params.arch)' "
             cmd+="--cpus '$(params.cpus)' "
             cmd+="--memory '$(params.memory)' "
             cmd+="--gpus '$(params.gpus)' "
@@ -236,6 +235,7 @@ spec:
           if [[ "$(params.nested-virt)" == "true" ]]; then
             cmd+="--nested-virt "
           fi
+          cmd+="--arch '$(params.arch)' "
           cmd+="--version '$(params.version)' "
           if [[ "$(params.spot)" == "true" ]]; then
             cmd+="--spot "