Reconcile EKSConfig correctly for MachinePool and other Owner kinds

[cnmcavoy]

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fixes EKSConfig reconciliation handling for non-Machine kind owner resources, such as MachinePools. Previously EKSConfig reconciliation stopped after the secret was created. However, the secret may need to be updated if the LaunchTemplate changes.

Additional logging and error handling improvements included alongside.

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 #3848

Special notes for your reviewer:

Checklist:

• squashed commits
• includes documentation
• adds unit tests
• adds or updates e2e tests

Release note:

Fixed EKSConfig reconciliation handling for non-Machine kind owner resources, such as MachinePools.

[k8s-ci-robot]

Hi @cnmcavoy. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

[Ankitasw]

/ok-to-test

[cnmcavoy]

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

[cnmcavoy]

/retest

[Ankitasw]

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Ankitasw

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

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

[Ankitasw]

/cherry-pick release-2.0

[Ankitasw]

/cherry-pick release-2.1

[k8s-infra-cherrypick-robot]

@Ankitasw: #4195 failed to apply on top of branch "release-2.0":

Applying: Reconcile EKSConfig correctly for MachinePool and other Owner kinds
Using index info to reconstruct a base tree...
M	bootstrap/eks/controllers/eksconfig_controller.go
M	bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go
M	bootstrap/eks/controllers/eksconfig_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging bootstrap/eks/controllers/eksconfig_controller_test.go
Auto-merging bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go
CONFLICT (content): Merge conflict in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go
Auto-merging bootstrap/eks/controllers/eksconfig_controller.go
CONFLICT (content): Merge conflict in bootstrap/eks/controllers/eksconfig_controller.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 Reconcile EKSConfig correctly for MachinePool and other Owner kinds
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-2.0

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.

[k8s-infra-cherrypick-robot]

@Ankitasw: #4195 failed to apply on top of branch "release-2.1":

Applying: Reconcile EKSConfig correctly for MachinePool and other Owner kinds
Using index info to reconstruct a base tree...
M	bootstrap/eks/controllers/eksconfig_controller.go
M	bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go
M	bootstrap/eks/controllers/eksconfig_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go
CONFLICT (content): Merge conflict in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go
Auto-merging bootstrap/eks/controllers/eksconfig_controller.go
CONFLICT (content): Merge conflict in bootstrap/eks/controllers/eksconfig_controller.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 Reconcile EKSConfig correctly for MachinePool and other Owner kinds
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-2.1

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.