chore: rebase fixups #150

Job	Run time
Unit Tests	5m 6s
UI	2m 13s
argo-images (argoexec)	3m 5s
Get changed files	6s
argo-images (argocli)	5m 16s
Codegen	3m 25s
E2E Tests (test-executor, minimal, false)	12m 7s
E2E Tests (test-corefunctional, minimal, false)	11m 17s
E2E Tests (test-functional, minimal, false)	18m 21s
E2E Tests (test-api, mysql, true)	5m 40s
E2E Tests (test-cli, mysql, true)	10m 12s
E2E Tests (test-cron, minimal, false)	16m 41s
E2E Tests (test-examples, minimal, false)	5m 54s
E2E Tests (test-plugins, plugins, false)	2m 59s
E2E Tests (test-java-sdk, minimal, true)	5m 57s
E2E Tests (test-python-sdk, minimal, true)	2m 39s
E2E Tests (test-executor, v1.28.11+k3s1, minimal, false)	11m 48s
E2E Tests (test-corefunctional, v1.28.11+k3s1, minimal, false)	11m 17s
E2E Tests (test-functional, v1.28.11+k3s1, minimal, false)	18m 22s
Lint	0s
	2h 32m 25s

Provide feedback