Skip to content

multi_stage: default VPN entrypoint wait timeout to 5m #5157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ibm-adarsh wants to merge 1 commit into from
+8 −2
Closed

multi_stage: default VPN entrypoint wait timeout to 5m #5157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkg/steps/multi_stage/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ const (
profileVolumeName = "cluster-profile"
vpnContainerName = "vpn-client"
leaseProxyScriptsMountPath = "/opt/scripts/lease-proxy"
// defaultVPNWaitTimeout is used when vpn.yaml does not set wait_timeout; cluster profiles may override.
defaultVPNWaitTimeout = "5m0s"
)

func (s *multiStageTestStep) generateObservers(
Expand Down Expand Up @@ -305,10 +307,14 @@ func addSecretWrapper(pod *coreapi.Pod, vpnConf *vpnConf, skipKubeconfig bool, g
container := &pod.Spec.Containers[0]
args := container.Args
container.Args = make([]string, 0)
if c := vpnConf; c != nil && c.WaitTimeout != nil {
if c := vpnConf; c != nil {
waitTimeout := defaultVPNWaitTimeout
if c.WaitTimeout != nil {
waitTimeout = *c.WaitTimeout
}
container.Args = append(container.Args,
"--wait-for-file", "/tmp/vpn/up",
"--wait-timeout", *c.WaitTimeout)
"--wait-timeout", waitTimeout)
}
if skipKubeconfig {
container.Args = append(container.Args, "--mode=skip-kubeconfig")
Expand Down