Fix backwards compatibility when backend mode isn't set

[WarpRat]

This will address the issue opened here: #9750

I changed the test to confirm that the gotemplate or function worked as expected. I ran the test multiple times locally with a different mix of configurations to confirm that this somewhat ugly chain of if/or/not works as intended and will address the issue.

[k8s-ci-robot]

Hi @WarpRat. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[rifelpet]

/ok-to-test

[fred-vogt]

@WarpRat - Excellent work my friend. Thanks for jumping on this so quickly.

I'm still building an integration around the newly available backendMode(s).

[WarpRat]

@fred-vogt - no problem, feel foolish that I missed this in the first place. I still need to make a minor update to bring the docs in line with the new default cluster id which @rifelpet suggested and the minor simplification that @johngmyers suggested above, but I should be able to handle that in an hour or two once I'm off work.

[rifelpet]

I'm not sure i understand the logic change here.

The old logic would add --cluster-id if any of the following:

• ClusterID API field is set
• BackendMode does not contain MountedFile (including if BackendMode is not set)

This new logic will add --cluster-id if any of the following:

• ClusterID API field is set
• BackendMode API field is not set
• BackendMode API field does not contain MountedFile

Wouldn't we want to not set --cluster-id if BackendMode is not set in order to preserve original behavior?

Suggested change

	{{- if or .Authentication.Aws.ClusterID (not .Authentication.Aws.BackendMode) (not (contains "MountedFile" .Authentication.Aws.BackendMode))}}
	{{- if or .Authentication.Aws.ClusterID (and .Authentication.Aws.BackendMode (not (contains "MountedFile" .Authentication.Aws.BackendMode)))}}

The above would add --cluster-id if any of the following:

• ClusterID API field is set
• BackendMode API field is set and does not contain MountedFile

[WarpRat]

Yeah, you're right. In my local tests I saw the --cluser-id flag get replaced with the --config and didn't even notice the clusterID flag was just a few lines lower. I've tested all the different possibilities you mentioned here and with your suggested change everything is working as expected. Thanks for catching that.

[rifelpet]

👍
/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet, WarpRat

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

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