🌱 Remove redundant GetRESTConfig in KCP Management.GetWorkloadCluster

[sbueringer]

Signed-off-by: Stefan Büringer buringerst@vmware.com

What this PR does / why we need it:

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]

This only made sense with the old code. Since we moved to CCT there is no reason to call GetRESTConfig twice.

Old code:

func (m *Management) GetWorkloadCluster(ctx context.Context, clusterKey client.ObjectKey) (WorkloadCluster, error) {
	// TODO(chuckha): Inject this dependency.
	// TODO(chuckha): memoize this function. The workload client only exists as long as a reconciliation loop.
	restConfig, err := remote.RESTConfig(ctx, KubeadmControlPlaneControllerName, m.Client, clusterKey)
	if err != nil {
		return nil, err
	}
	restConfig.Timeout = 30 * time.Second

	if m.Tracker == nil {
		return nil, errors.New("Cannot get WorkloadCluster: No remote Cluster Cache")
	}

	c, err := m.Tracker.GetClient(ctx, clusterKey)
	if err != nil {
		return nil, err
	}

	clientConfig, err := m.Tracker.GetRESTConfig(ctx, clusterKey)
	if err != nil {
		return nil, err
	}

	// Make sure we use the same CA and Host as the client.
	// Note: This has to be done to be able to communicate directly on self-hosted clusters.
	restConfig.CAData = clientConfig.CAData
	restConfig.CAFile = clientConfig.CAFile
	restConfig.Host = clientConfig.Host

[sbueringer]

/cc @Levi080513 @jessehu
/assign @fabriziopandini @killianmuldoon @chrischdi

[k8s-ci-robot]

@sbueringer: GitHub didn't allow me to request PR reviews from the following users: Levi080513, jessehu.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @Levi080513 @jessehu
/assign @fabriziopandini @killianmuldoon @chrischdi

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]

I think this nil check is pretty useless. If it would be a problem it would panic in l.108 at the moment. And if it wouldn't, our e2e tests would never be green if we always return an error

[chrischdi]

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 151b53325673ba9d5d5fe3fdd86c0c2bad868e08

[killianmuldoon]

/area provider/control-plane-kubeadm

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon

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

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

[killianmuldoon]

/cherry-pick release-1.5

[k8s-infra-cherrypick-robot]

@killianmuldoon: #9448 failed to apply on top of branch "release-1.5":

Applying: Remove redundant GetRESTConfig in KCP Management.GetWorkloadCluster
Using index info to reconstruct a base tree...
M	controlplane/kubeadm/internal/cluster.go
Falling back to patching base and 3-way merge...
Auto-merging controlplane/kubeadm/internal/cluster.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/cluster.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 Remove redundant GetRESTConfig in KCP Management.GetWorkloadCluster
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.5

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.

[killianmuldoon]

I'll try again after the first PR merges.

[killianmuldoon]

/cherry-pick release-1.5

[k8s-infra-cherrypick-robot]

@killianmuldoon: #9448 failed to apply on top of branch "release-1.5":

Applying: Remove redundant GetRESTConfig in KCP Management.GetWorkloadCluster
Using index info to reconstruct a base tree...
M	controlplane/kubeadm/internal/cluster.go
Falling back to patching base and 3-way merge...
Auto-merging controlplane/kubeadm/internal/cluster.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/cluster.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 Remove redundant GetRESTConfig in KCP Management.GetWorkloadCluster
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.5

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.

[killianmuldoon]

/cherry-pick release-1.5

[k8s-infra-cherrypick-robot]

@killianmuldoon: new pull request created: #9451

In response to this:

/cherry-pick release-1.5

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.

[killianmuldoon]

/cherry-pick release-1.4

[k8s-infra-cherrypick-robot]

@killianmuldoon: new pull request created: #9453

In response to this:

/cherry-pick release-1.4

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.