feedback

edgelesssys · Jan 12, 2024 · 8bb0e47 · 8bb0e47
1 parent 18473f9
commit 8bb0e47
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/e2e-test-provider-example.yml b/.github/workflows/e2e-test-provider-example.yml
@@ -223,7 +223,7 @@ jobs:
             required_providers {
               constellation = {
                 source  = "edgelesssys/constellation"
-                version            = "${version}"
+                version = "${version}"
               }
             }
           }
@@ -234,9 +234,9 @@ jobs:
           }
 
           locals {
-            name                = "${{ steps.create-prefix.outputs.prefix }}"
-            image_version            = "${image_version}"
-            microservice_version= "${prefixed_version}"
+            name = "${{ steps.create-prefix.outputs.prefix }}"
+            image_version = "${image_version}"
+            microservice_version = "${prefixed_version}"
             kubernetes_version = "${kubernetes_version}"
           }
 
@@ -323,13 +323,11 @@ jobs:
         working-directory: ${{ github.workspace }}/cluster
         shell: bash
         run: |
-          if [[ "${{ inputs.toImage }}" != "" ]]; then
           cat >> _override.tf <<EOF
           locals {
-            image_version = "${{ inputs.toImage && inputs.toImage || steps.find-latest-image.outputs.image }}"
+            image_version = "${{ inputs.toImage || steps.find-latest-image.outputs.image }}"
           }
           EOF
-          fi
 
           if [[ "${{ inputs.toKubernetes }}" != "" ]]; then
           cat >> _override.tf <<EOF
@@ -425,7 +423,6 @@ jobs:
             yq e '.nodeGroups.control_plane_default.zone = "eu-central-1a"' -i constellation-conf.yaml
             yq e '.nodeGroups.worker_default.zone = "eu-central-1a"' -i constellation-conf.yaml
           fi
-
           KUBECONFIG=${{ github.workspace }}/cluster/constellation-admin.conf bazel run //e2e/provider-upgrade:provider-upgrade_test -- --want-worker "$WORKERNODES" --want-control "$CONTROLNODES" --cli "${{ github.workspace }}/build/constellation" "$IMAGE_FLAG" "$KUBERNETES_FLAG" "$MICROSERVICES_FLAG"
 
       - name: Destroy Terraform Cluster

diff --git a/e2e/internal/upgrade/upgrade.go b/e2e/internal/upgrade/upgrade.go
@@ -65,10 +65,10 @@ func AssertUpgradeSuccessful(t *testing.T, cli string, targetVersions VersionCon
 	require.NotNil(t, k)
 
 	testMicroservicesEventuallyHaveVersion(t, targetVersions.Microservices, timeout)
-	fmt.Println("Microservices are upgraded.")
+	log.Println("Microservices are upgraded.")
 
 	testNodesEventuallyHaveVersion(t, k, targetVersions, wantControl+wantWorker, timeout)
-	fmt.Println("Nodes are upgraded.")
+	log.Println("Nodes are upgraded.")
 	wg.Wait()
 }
 

diff --git a/e2e/internal/upgrade/upgrade_test.go b/e2e/internal/upgrade/upgrade_test.go
@@ -41,8 +41,8 @@ var (
 	// When executing the test as a bazel target the CLI path is supplied through an env variable that bazel sets.
 	// When executing via `go test` extra care should be taken that the supplied CLI is built on the same commit as this test.
 	cliPath     = flag.String("cli", "", "Constellation CLI to run the tests.")
-	wantWorker  = flag.Int("want-worker", 0, "Number of wanted worker nodes.")
-	wantControl = flag.Int("want-control", 0, "Number of wanted control nodes.")
+	wantWorker  = flag.Int("want-worker", 1, "Number of wanted worker nodes.")
+	wantControl = flag.Int("want-control", 1, "Number of wanted control nodes.")
 	timeout     = flag.Duration("timeout", 3*time.Hour, "Timeout after which the cluster should have converged to the target version.")
 )