Minor cleanup in apiserver startup in integration tests

[wojtek-t]

NONE

/kind cleanup
/priority important-longerm
/sig testing

[k8s-ci-robot]

@wojtek-t: The label(s) priority/important-longerm cannot be applied, because the repository doesn't have them.

In response to this:

NONE

/kind cleanup
/priority important-longerm
/sig testing

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-ci-robot]

@wojtek-t: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wojtek-t

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:

• test/OWNERS [wojtek-t]

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

[aojea]

the CloseFn returned already has a s.Close()

kubernetes/test/integration/framework/master_utils.go

Lines 147 to 153 in ce50018

	closeFn := func() {
	if m != nil {
	m.GenericAPIServer.RunPreShutdownHooks()
	}
	close(stopCh)
	s.Close()
	}

I think that the shutdownFunc can be removed with this change

[wojtek-t]

Good catch - PTAL

[aojea]

/lgtm

[aojea]

/lgtm

[wojtek-t]

@aojea - sorry for that, should finally be fixed now (and tests should pass)

[aojea]

/lgtm

[aojea]

Kubernetes e2e suite: [sig-node] Downward API should provide pod UID as env vars [NodeConformance] [Conformance] expand_less

I start to see this failures on Node tests more often 👀
/retest