Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tkn/infra-aws-ocp-snc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tkn/infra-azure-aks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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 "
Expand Down
2 changes: 1 addition & 1 deletion tkn/infra-azure-fedora.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
4 changes: 2 additions & 2 deletions tkn/infra-azure-rhel-ai.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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
fi
2 changes: 1 addition & 1 deletion tkn/infra-azure-rhel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
2 changes: 1 addition & 1 deletion tkn/infra-azure-windows-desktop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
1 change: 1 addition & 0 deletions tkn/template/infra-aws-eks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
secret-key: ${secret_key}
region: ${region}
bucket: ${bucket}

# Mapt params
- name: id
description: identifier for the provisioned environment
Expand Down
4 changes: 2 additions & 2 deletions tkn/template/infra-azure-aks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tkn/template/infra-azure-fedora.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
4 changes: 2 additions & 2 deletions tkn/template/infra-azure-rhel-ai.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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
fi
2 changes: 1 addition & 1 deletion tkn/template/infra-azure-rhel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
2 changes: 1 addition & 1 deletion tkn/template/infra-azure-windows-desktop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down