From 6c07a2892e8ddbf4de8c1ce8bea79d317cf22d41 Mon Sep 17 00:00:00 2001
From: Otto Bittner <cobittner@posteo.net>
Date: Mon, 27 Feb 2023 10:27:06 +0100
Subject: [PATCH] ci: adapt pipeline to use --kubernetes flag

---
 .../actions/constellation_create/action.yml   | 13 ++++------
 .github/workflows/e2e-test-manual.yml         |  2 +-
 .github/workflows/e2e-test-weekly.yml         | 26 +++++++++----------
 .github/workflows/release.yml                 |  2 +-
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml
index 6929b26c2..1da01460e 100644
--- a/.github/actions/constellation_create/action.yml
+++ b/.github/actions/constellation_create/action.yml
@@ -75,7 +75,11 @@ runs:
       shell: bash
       if: inputs.existingConfig != 'true'
       run: |
-        constellation config generate ${{ inputs.cloudProvider }}
+        if [[ ${{ inputs.kubernetesVersion != '' }} == true ]]; then
+          constellation config generate ${{ inputs.cloudProvider }} --kubernetes="${{ inputs.kubernetesVersion }}"
+        else
+          constellation config generate ${{ inputs.cloudProvider }}
+        fi
 
         yq eval -i "(.name) = \"e2e-test\"" constellation-conf.yaml
 
@@ -103,13 +107,6 @@ runs:
             (.provider | select(. | has(\"aws\")).aws.iamProfileWorkerNodes) = \"e2e_test_worker_node_instance_profile\"" \
           constellation-conf.yaml
 
-    - name: Update config
-      shell: bash
-      run: |
-        if [[ ${{ inputs.kubernetesVersion != '' }} = true ]]; then
-          yq eval -i "(.kubernetesVersion) = \"${{ inputs.kubernetesVersion }}\"" constellation-conf.yaml
-        fi
-
     - name: Remove embedded measurements
       if: inputs.keepMeasurements == 'false'
       shell: bash
diff --git a/.github/workflows/e2e-test-manual.yml b/.github/workflows/e2e-test-manual.yml
index c4c650644..93c1d5aec 100644
--- a/.github/workflows/e2e-test-manual.yml
+++ b/.github/workflows/e2e-test-manual.yml
@@ -43,7 +43,7 @@ on:
         required: true
       kubernetesVersion:
         description: "Kubernetes version to create the cluster from."
-        default: "1.25.6"
+        default: "1.25"
         required: true
       keepMeasurements:
         description: "Keep measurements embedded in the CLI."
diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml
index 03f0226ce..34a36de25 100644
--- a/.github/workflows/e2e-test-weekly.yml
+++ b/.github/workflows/e2e-test-weekly.yml
@@ -48,38 +48,38 @@ jobs:
         test:
           ["sonobuoy full", "autoscaling", "k-bench", "lb", "verify", "recover", "iamcreate"]
         provider: ["gcp", "azure", "aws"]
-        version: ["v1.24.9", "v1.25.6", "v1.26.1"]
+        version: ["v1.24", "v1.25", "v1.26"]
         exclude:
           # IAM create test runs only on latest version.
           - test: "iamcreate"
-            version: "v1.24.9"
+            version: "v1.24"
           - test: "iamcreate"
-            version: "v1.25.6"
+            version: "v1.25"
           # Verify test runs only on latest version.
           - test: "verify"
-            version: "v1.24.9"
+            version: "v1.24"
           - test: "verify"
-            version: "v1.25.6"
+            version: "v1.25"
           # Recover test runs only on latest version.
           - test: "recover"
-            version: "v1.24.9"
+            version: "v1.24"
           - test: "recover"
-            version: "v1.25.6"
+            version: "v1.25"
           # Autoscaling test runs only on latest version.
           - test: "autoscaling"
-            version: "v1.24.9"
+            version: "v1.24"
           - test: "autoscaling"
-            version: "v1.25.6"
+            version: "v1.25"
           # K-bench test runs only on latest version.
           - test: "k-bench"
-            version: "v1.24.9"
+            version: "v1.24"
           - test: "k-bench"
-            version: "v1.25.6"
+            version: "v1.25"
           # lb test runs only on latest version.
           - test: "lb"
-            version: "v1.24.9"
+            version: "v1.24"
           - test: "lb"
-            version: "v1.25.6"
+            version: "v1.25"
           # Currently not supported on AWS.
           - test: "autoscaling"
             provider: "aws"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 274d23951..a4b95acd0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -308,7 +308,7 @@ jobs:
       cloudProvider: ${{ matrix.csp }}
       runner: ${{ matrix.runner }}
       test: "sonobuoy full"
-      kubernetesVersion: "v1.25.6"
+      kubernetesVersion: "v1.25"
       keepMeasurements: true
       osImage: ${{ inputs.version }}
       machineType: "default"