diff --git a/.github/ci_templates/e2e_tests.yml b/.github/ci_templates/e2e_tests.yml index fca7085621..c3257a3a10 100644 --- a/.github/ci_templates/e2e_tests.yml +++ b/.github/ci_templates/e2e_tests.yml @@ -643,7 +643,7 @@ check_e2e_labels: # {!{ $ctx.jobID }!}: name: "{!{ $ctx.jobName }!}" - if: ${{ fromJson(inputs.test_config).cri == '{!{ $ctx.cri }!}' && github.event.inputs.k8s_version == '{!{ $ctx.kubernetesVersion }!}' && github.event.inputs.layout == '{!{ $ctx.layout }!}' }} + if: ${{ fromJson(inputs.test_config).cri == '{!{ $ctx.cri }!}' && fromJson(inputs.test_config).ver == '{!{ $ctx.kubernetesVersion }!}' && github.event.inputs.layout == '{!{ $ctx.layout }!}' }} env: PROVIDER: {!{ $ctx.providerName }!} CRI: {!{ $ctx.criName }!} diff --git a/.github/scripts/js/e2e/slash_workflow_command.js b/.github/scripts/js/e2e/slash_workflow_command.js index e2f44a1858..b778eb7d40 100644 --- a/.github/scripts/js/e2e/slash_workflow_command.js +++ b/.github/scripts/js/e2e/slash_workflow_command.js @@ -60,8 +60,10 @@ function tryParseAbortE2eCluster({argv, context, core}){ const layout = ranForSplit[1]; const cri = ranForSplit[2]; const k8s_version = ranForSplit[3]; + const edition = 'fe'; const k8sSlug = k8s_version.replace('.', '_'); const state_artifact_name = `failed_cluster_state_${provider}_${cri}_${k8sSlug}`; + const test_config = JSON.stringify({ cri: cri, ver: k8s_version, edition: edition }) const inputs = { run_id, @@ -71,8 +73,7 @@ function tryParseAbortE2eCluster({argv, context, core}){ ssh_master_connection_string: sshConnectStr, layout, - cri, - k8s_version, + test_config, issue_number: prNumber.toString(), }; diff --git a/.github/workflow_templates/e2e.abort.multi.yml b/.github/workflow_templates/e2e.abort.multi.yml index 583fc616ca..2f59f0c3fa 100644 --- a/.github/workflow_templates/e2e.abort.multi.yml +++ b/.github/workflow_templates/e2e.abort.multi.yml @@ -73,12 +73,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' diff --git a/.github/workflows/e2e-abort-aws.yml b/.github/workflows/e2e-abort-aws.yml index 8e6f5825f4..1793decdfd 100644 --- a/.github/workflows/e2e-abort-aws.yml +++ b/.github/workflows/e2e-abort-aws.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: AWS, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: AWS CRI: Containerd @@ -398,7 +396,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: AWS, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: AWS CRI: Containerd @@ -688,7 +686,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: AWS, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: AWS CRI: Containerd @@ -978,7 +976,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: AWS, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: AWS CRI: Containerd @@ -1268,7 +1266,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: AWS, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: AWS CRI: Containerd @@ -1558,7 +1556,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: AWS, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: AWS CRI: Containerd @@ -1848,7 +1846,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: AWS, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: AWS CRI: Containerd diff --git a/.github/workflows/e2e-abort-azure.yml b/.github/workflows/e2e-abort-azure.yml index 5e95770c52..b0632dfb83 100644 --- a/.github/workflows/e2e-abort-azure.yml +++ b/.github/workflows/e2e-abort-azure.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: Azure, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: Azure CRI: Containerd @@ -402,7 +400,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: Azure, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: Azure CRI: Containerd @@ -696,7 +694,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: Azure, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: Azure CRI: Containerd @@ -990,7 +988,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: Azure, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: Azure CRI: Containerd @@ -1284,7 +1282,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: Azure, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: Azure CRI: Containerd @@ -1578,7 +1576,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: Azure, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: Azure CRI: Containerd @@ -1872,7 +1870,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: Azure, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: Azure CRI: Containerd diff --git a/.github/workflows/e2e-abort-eks.yml b/.github/workflows/e2e-abort-eks.yml index ef849b0e5f..4379a2719a 100644 --- a/.github/workflows/e2e-abort-eks.yml +++ b/.github/workflows/e2e-abort-eks.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: EKS, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: EKS CRI: Containerd @@ -401,7 +399,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: EKS, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: EKS CRI: Containerd @@ -694,7 +692,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: EKS, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: EKS CRI: Containerd @@ -987,7 +985,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: EKS, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: EKS CRI: Containerd @@ -1280,7 +1278,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: EKS, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: EKS CRI: Containerd @@ -1573,7 +1571,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: EKS, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: EKS CRI: Containerd @@ -1866,7 +1864,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: EKS, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: EKS CRI: Containerd diff --git a/.github/workflows/e2e-abort-gcp.yml b/.github/workflows/e2e-abort-gcp.yml index ad4432ee3c..c87b1b4d48 100644 --- a/.github/workflows/e2e-abort-gcp.yml +++ b/.github/workflows/e2e-abort-gcp.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: GCP, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: GCP CRI: Containerd @@ -396,7 +394,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: GCP, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: GCP CRI: Containerd @@ -684,7 +682,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: GCP, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: GCP CRI: Containerd @@ -972,7 +970,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: GCP, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: GCP CRI: Containerd @@ -1260,7 +1258,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: GCP, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: GCP CRI: Containerd @@ -1548,7 +1546,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: GCP, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: GCP CRI: Containerd @@ -1836,7 +1834,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: GCP, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: GCP CRI: Containerd diff --git a/.github/workflows/e2e-abort-openstack.yml b/.github/workflows/e2e-abort-openstack.yml index 6ce9c5ee12..c8590e8575 100644 --- a/.github/workflows/e2e-abort-openstack.yml +++ b/.github/workflows/e2e-abort-openstack.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: OpenStack, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: OpenStack CRI: Containerd @@ -396,7 +394,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: OpenStack, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: OpenStack CRI: Containerd @@ -684,7 +682,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: OpenStack, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: OpenStack CRI: Containerd @@ -972,7 +970,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: OpenStack, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: OpenStack CRI: Containerd @@ -1260,7 +1258,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: OpenStack, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: OpenStack CRI: Containerd @@ -1548,7 +1546,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: OpenStack, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: OpenStack CRI: Containerd @@ -1836,7 +1834,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: OpenStack, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: OpenStack CRI: Containerd diff --git a/.github/workflows/e2e-abort-static.yml b/.github/workflows/e2e-abort-static.yml index 80f00fc707..245e1f88ef 100644 --- a/.github/workflows/e2e-abort-static.yml +++ b/.github/workflows/e2e-abort-static.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: Static, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'Static' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'Static' }} env: PROVIDER: Static CRI: Containerd @@ -396,7 +394,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: Static, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'Static' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'Static' }} env: PROVIDER: Static CRI: Containerd @@ -684,7 +682,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: Static, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'Static' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'Static' }} env: PROVIDER: Static CRI: Containerd @@ -972,7 +970,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: Static, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'Static' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'Static' }} env: PROVIDER: Static CRI: Containerd @@ -1260,7 +1258,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: Static, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'Static' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'Static' }} env: PROVIDER: Static CRI: Containerd @@ -1548,7 +1546,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: Static, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'Static' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'Static' }} env: PROVIDER: Static CRI: Containerd @@ -1836,7 +1834,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: Static, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'Static' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'Static' }} env: PROVIDER: Static CRI: Containerd diff --git a/.github/workflows/e2e-abort-vcd.yml b/.github/workflows/e2e-abort-vcd.yml index de7e253c2f..3e7e4ac55f 100644 --- a/.github/workflows/e2e-abort-vcd.yml +++ b/.github/workflows/e2e-abort-vcd.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: VCD, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: VCD CRI: Containerd @@ -404,7 +402,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: VCD, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: VCD CRI: Containerd @@ -700,7 +698,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: VCD, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: VCD CRI: Containerd @@ -996,7 +994,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: VCD, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: VCD CRI: Containerd @@ -1292,7 +1290,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: VCD, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: VCD CRI: Containerd @@ -1588,7 +1586,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: VCD, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: VCD CRI: Containerd @@ -1884,7 +1882,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: VCD, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: VCD CRI: Containerd diff --git a/.github/workflows/e2e-abort-vsphere.yml b/.github/workflows/e2e-abort-vsphere.yml index 094cffa5ee..e52c43c26b 100644 --- a/.github/workflows/e2e-abort-vsphere.yml +++ b/.github/workflows/e2e-abort-vsphere.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: vSphere, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: vSphere CRI: Containerd @@ -398,7 +396,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: vSphere, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: vSphere CRI: Containerd @@ -688,7 +686,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: vSphere, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: vSphere CRI: Containerd @@ -978,7 +976,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: vSphere, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: vSphere CRI: Containerd @@ -1268,7 +1266,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: vSphere, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: vSphere CRI: Containerd @@ -1558,7 +1556,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: vSphere, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: vSphere CRI: Containerd @@ -1848,7 +1846,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: vSphere, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'Standard' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'Standard' }} env: PROVIDER: vSphere CRI: Containerd diff --git a/.github/workflows/e2e-abort-yandex-cloud.yml b/.github/workflows/e2e-abort-yandex-cloud.yml index abd123ecaf..3f29acef68 100644 --- a/.github/workflows/e2e-abort-yandex-cloud.yml +++ b/.github/workflows/e2e-abort-yandex-cloud.yml @@ -25,12 +25,10 @@ on: layout: description: 'Cloud provider layout which was tested' required: true - cri: - description: 'CRI which was tested' - required: true - k8s_version: - description: 'CRI which was tested' - required: true + test_config: + description: 'JSON string of parameters which was tested' + required: false + default: '{"cri":"Containerd","ver":"1.27","edition":"FE"}' # needs for run correct installer image for abort installer_image_path: description: 'Installer image without host' @@ -108,7 +106,7 @@ jobs: # run_containerd_1_26: name: "destroy cluster: Yandex.Cloud, Containerd, Kubernetes 1.26" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.26' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: Yandex.Cloud CRI: Containerd @@ -400,7 +398,7 @@ jobs: # run_containerd_1_27: name: "destroy cluster: Yandex.Cloud, Containerd, Kubernetes 1.27" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.27' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: Yandex.Cloud CRI: Containerd @@ -692,7 +690,7 @@ jobs: # run_containerd_1_28: name: "destroy cluster: Yandex.Cloud, Containerd, Kubernetes 1.28" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.28' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: Yandex.Cloud CRI: Containerd @@ -984,7 +982,7 @@ jobs: # run_containerd_1_29: name: "destroy cluster: Yandex.Cloud, Containerd, Kubernetes 1.29" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.29' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: Yandex.Cloud CRI: Containerd @@ -1276,7 +1274,7 @@ jobs: # run_containerd_1_30: name: "destroy cluster: Yandex.Cloud, Containerd, Kubernetes 1.30" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.30' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: Yandex.Cloud CRI: Containerd @@ -1568,7 +1566,7 @@ jobs: # run_containerd_1_31: name: "destroy cluster: Yandex.Cloud, Containerd, Kubernetes 1.31" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == '1.31' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: Yandex.Cloud CRI: Containerd @@ -1860,7 +1858,7 @@ jobs: # run_containerd_automatic: name: "destroy cluster: Yandex.Cloud, Containerd, Kubernetes Automatic" - if: ${{ fromJson(inputs.test_config).cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} + if: ${{ fromJson(inputs.test_config).cri == 'containerd' && fromJson(inputs.test_config).ver == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }} env: PROVIDER: Yandex.Cloud CRI: Containerd