🐛 e2e: fix cgroup branching in cluster upgrade test

[sbueringer]

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
The cluster upgrade test didn't detect the Kubernetes version correctly.

The e2eConfig.Variables map only contains the values from the e2e config / docker.yaml, while GetVariable also takes env variables into account.

Concrete error case:

• ci job v1.24 => v1.25 latest
• Actual KubernetesVersionUpgradeFrom was v1.24.1
• Test detected v1.23.6 from e2e config and ignored env var
• Test chose to use the cgroupfs flavor instead of the regular one
• cgroupfs doesn't work with v1.24.1
  • grep for upgrades-cgroupfs in https://storage.googleapis.com/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/6543/pull-cluster-api-e2e-workload-upgrade-1-24-latest-main/1530078512034091008/build-log.txt

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

[sbueringer]

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-24-latest-main

cc @killianmuldoon @fabriziopandini

[sbueringer]

/cherry-pick release-1.1

cc @chrischdi (just fyi)

[k8s-infra-cherrypick-robot]

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.1 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.1

cc @chrischdi (just fyi)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[sbueringer]

/hold
for a green run of pull-cluster-api-e2e-workload-upgrade-1-24-latest-main

[fabriziopandini]

/lgtm
/approve
feel free to unhold if test are green

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [fabriziopandini]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[sbueringer]

Test is green

/hold cancel

[killianmuldoon]

/lgtm

(pending green test 😄)

[sbueringer]

/lgtm

(pending green test 😄)

Test's were all green. Currently those are just re-tests for merge by Prow :)

[k8s-infra-cherrypick-robot]

@sbueringer: #6557 failed to apply on top of branch "release-1.1":

Applying: e2e: fix cgroup branching in cluster upgrade test
Using index info to reconstruct a base tree...
M	test/e2e/cluster_upgrade_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/cluster_upgrade_test.go
CONFLICT (content): Merge conflict in test/e2e/cluster_upgrade_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 e2e: fix cgroup branching in cluster upgrade test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.1

cc @chrischdi (just fyi)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[sbueringer]

Note: I don't need the cherry-pick, I just included it in the other cherry-pick: #6560