Skip to content

Commit 28d5e5a

Browse files
authored
Merge pull request #4084 from norio-nomura/progress-remove-waiting-ssh-ready
`--progress`: remove waiting 'SSH Ready'
2 parents 13571f8 + 6c4234e commit 28d5e5a

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

pkg/hostagent/hostagent.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -924,34 +924,6 @@ func (a *HostAgent) watchCloudInitProgress(ctx context.Context) {
924924
Active: true,
925925
})
926926

927-
maxRetries := 30
928-
retryDelay := time.Second
929-
var sshReady bool
930-
931-
for i := 0; i < maxRetries && !sshReady; i++ {
932-
if i > 0 {
933-
time.Sleep(retryDelay)
934-
}
935-
936-
// Test SSH connectivity
937-
args := a.sshConfig.Args()
938-
args = append(args,
939-
"-p", strconv.Itoa(a.sshLocalPort),
940-
"127.0.0.1",
941-
"echo 'SSH Ready'",
942-
)
943-
944-
cmd := exec.CommandContext(ctx, a.sshConfig.Binary(), args...)
945-
if err := cmd.Run(); err == nil {
946-
sshReady = true
947-
logrus.Debug("SSH ready for cloud-init monitoring")
948-
}
949-
}
950-
951-
if !sshReady {
952-
logrus.Warn("SSH not ready for cloud-init monitoring, proceeding anyway")
953-
}
954-
955927
args := a.sshConfig.Args()
956928
args = append(args,
957929
"-p", strconv.Itoa(a.sshLocalPort),

0 commit comments

Comments
 (0)