Fix KUBERNETES_VERSION unset if CLUSTER_TEMPLATE set

[lzhecheng]

Signed-off-by: Zhecheng Li [email protected]

What type of PR is this?
/kind bug

What this PR does / why we need it:

• If CLUSTER_TEMPLATE is set, the ci-entrypoint.sh logic
  leads to KUBERNETES_VERSION error like "vlatest".
• Dump AZURE_LOCATION abd kubectl get node result.
• Not overwrite original K8S_FEATURE_GATES if TEST_WINDOWS is true
  related: Deprecate aks-engine e2e test cloud-provider-azure#919
  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 #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

• squashed commits
• includes documentation
• adds unit tests

Release note:

Fix: If CLUSTER_TEMPLATE is set, the ci-entrypoint.sh logic, leads to KUBERNETES_VERSION error like "vlatest". Dump AZURE_LOCATION abd kubectl get node, pod results. Not overwrite original K8S_FEATURE_GATES if TEST_WINDOWS is true

[lzhecheng]

/cc @CecileRobertMichon @jackfrancis

[jackfrancis]

Thanks @lzhecheng!

Can we merge #2325 first, as that follows-up test-infra changes that have recently landed.

Then we can address the issue of separating "choosing a template" from "choosing a kubernetes version" in this script.

[Jont828]

@jackfrancis Would that require a rebase of this PR or would the logic mostly stay the same?

[jackfrancis]

A rebase is almost certainly going to be required. :/

[lzhecheng]

@jackfrancis sure :)

[lzhecheng]

/retest

[CecileRobertMichon]

#2325 has merged, this should be good to go after rebase

[jackfrancis]

@lzhecheng thank you for your patience ❤️

[lzhecheng]

/retest

[lzhecheng]

ci-entrypoint is failing:

# Create workload Cluster.
cluster.cluster.x-k8s.io/capz-hwobgi created
azurecluster.infrastructure.cluster.x-k8s.io/capz-hwobgi created
error: error parsing STDIN: error converting YAML to JSON: yaml: line 12: did not find expected node content
make[1]: *** [Makefile:285: create-workload-cluster] Error 1
make[1]: Leaving directory '/home/prow/go/src/sigs.k8s.io/cluster-api-provider-azure'

Thanks. Now it is fixed.

[CecileRobertMichon]

Looks great, thanks @lzhecheng. Just one more comment about the on_exit get pods/nodes returning a non-zero exit code.

/assign @jackfrancis

[CecileRobertMichon]

/lgtm

[jackfrancis]

/lgtm

I like the way these iterations are trending, thanks @lzhecheng!

[jackfrancis]

/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

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 [jackfrancis]

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

[jackfrancis]

/cherry-pick release-1.3

[k8s-infra-cherrypick-robot]

@jackfrancis: #2346 failed to apply on top of branch "release-1.3":

Applying: Fix KUBERNETES_VERSION unset if CLUSTER_TEMPLATE set * If CLUSTER_TEMPLATE is set, the ci-entrypoint.sh logic leads to KUBERNETES_VERSION error like "vlatest". * Dump AZURE_LOCATION abd kubectl get node result. * Not overwrite original K8S_FEATURE_GATES if TEST_WINDOWS is true
Using index info to reconstruct a base tree...
M	scripts/ci-entrypoint.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/ci-entrypoint.sh
CONFLICT (content): Merge conflict in scripts/ci-entrypoint.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix KUBERNETES_VERSION unset if CLUSTER_TEMPLATE set * If CLUSTER_TEMPLATE is set, the ci-entrypoint.sh logic leads to KUBERNETES_VERSION error like "vlatest". * Dump AZURE_LOCATION abd kubectl get node result. * Not overwrite original K8S_FEATURE_GATES if TEST_WINDOWS is true
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.3

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.