hypershift dump: use random local port for kas port-forwarding #2625
Conversation
|
/area cli |
openshift-ci
bot
added
area/cli
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: csrwng 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:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
| @@ -120,16 +123,31 @@ func dumpGuestCluster(ctx context.Context, opts *DumpOptions) error { | |||
| return fmt.Errorf("failed to create tempfile for kubeconfig: %w", err) | |||
| } | |||
| defer func() { | |||
| if err := kubeconfigFile.Close(); err != nil { | |||
| opts.Log.Error(err, "Failed to close kubeconfig file") | |||
| } | |||
There was a problem hiding this comment.
Because we should have closed it before invoking the oc command to use it. It's a bug that we're waiting for the end of the function to close it.
There was a problem hiding this comment.
Yeah I'm with Seth.. I'd be concerned there's no guarantee of a Close() here before we call the Exec() of oc using this file. With this change you're depending on garbage collection to close the file.. not sure it's guaranteed to happen right away.
csrwng
force-pushed
the
fix_cluster_dump
branch
2 times, most recently
from
5ec381e
to
5eedc8d
Compare
cmd/cluster/core/dump.go
Outdated
| if err := kubeconfigFile.Close(); err != nil { | ||
| log.Error(err, "Failed to close temporary kubeconfig file") | ||
| } | ||
| if err := os.Remove(kubeconfigFile.Name()); err != nil { |
There was a problem hiding this comment.
isn't this going to remove the kubeconfig file before DumpGuestCluster() can use it?
When executing multiple 'cluster dump' within the same pod (as in the e2e case), only one run can listen on port 6443 and the others fail. This changes the dump command to use a random port locally so that different runs do not conflict.
|
/lgtm |
|
/retest-required |
|
@csrwng: The following test failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
What this PR does / why we need it:
When executing multiple 'cluster dump' within the same pod (as in the e2e case), only one run can listen on port 6443 and the others fail. This changes the dump command to use a random port locally so that different runs do not conflict.
Checklist