Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix VM wf #558

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Fix VM wf #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb87bd
Fix vm.status output tostring
gabriel-farache Dec 18, 2024
a2b0e6b
Add pattern validation for update vm
gabriel-farache Dec 18, 2024
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
4 changes: 2 additions & 2 deletions workflows/modify-vm-resources/modify-vm-resources.sw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ functions:
operation: '{
"result": {
"completedWith":"error",
"message": "VM " + .vm_name + " in namespace " + .vm_namespace + " not ready after the update after checking" + (.vmStatusRunningRetries|tostring) + " times: " + .vm.status
"message": "VM " + .vm_name + " in namespace " + .vm_namespace + " not ready after the update after checking" + (.vmStatusRunningRetries|tostring) + " times: " + (.vm.status|tostring)
}
}'
- name: errorAuthorizationDeniedResult
Expand Down Expand Up @@ -322,7 +322,7 @@ states:
entityRef: .recipients
payload:
title: '"VM " + .vm_name + " in namespace " + .vm_namespace + " not ready"'
description: '"VM " + .vm_name + " in namespace " + .vm_namespace + " not ready after the update after checking" + (.vmStatusRunningRetries|tostring) + " times: " + .vm.status'
description: '"VM " + .vm_name + " in namespace " + .vm_namespace + " not ready after the update after checking" + (.vmStatusRunningRetries|tostring) + " times: " + (.vm.status|tostring)'
topic: "Modify VM Resources workflow"
severity: "high"
- name: setOutput
Expand Down
3 changes: 2 additions & 1 deletion workflows/modify-vm-resources/schemas/modify-vm-resources__main-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"title": "Memory",
"description": "The new guest memory of the VM",
"type": "string",
"examples": ["2Gi"]
"examples": ["2Gi"],
"pattern": "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
},
"vm_new_cpu_cores": {
"title": "CPU Cores",
Expand Down
4 changes: 2 additions & 2 deletions workflows/request-vm-cnv/request-vm-cnv.sw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ functions:
operation: '{
"result": {
"completedWith":"error",
"message": "VM " + .vm_name + " in namespace " + .vm_namespace + " using image " + .vm_image +" not ready after " + (.vmStatusRunning|tostring) + " retries: " + .vm.status
"message": "VM " + .vm_name + " in namespace " + .vm_namespace + " using image " + .vm_image +" not ready after " + (.vmStatusRunning|tostring) + " retries: " + (.vm.status|tostring)
}
}'
- name: errorAuthorizationDeniedResult
Expand Down Expand Up @@ -315,7 +315,7 @@ states:
entityRef: .recipients
payload:
title: '"VM " + .vm_name + " in namespace "+.vm_namespace + " not ready"'
description: '"VM " + .vm_name + " in namespace " + .vm_namespace + " using image " + .vm_image +" not ready after " + (.vmStatusRunningRetries|tostring) + " retries: " + .vm.status'
description: '"VM " + .vm_name + " in namespace " + .vm_namespace + " using image " + .vm_image +" not ready after " + (.vmStatusRunningRetries|tostring) + " retries: " + (.vm.status|tostring)'
topic: "Request VM on CNV workflow"
severity: "high"
- name: setOutput
Expand Down
Loading