Merge pull request #3227 from k8s-infra-cherrypick-robot/cherry-pick-3225-to-release-1.11

k8s-ci-robot · web-flow · commit b311ee890343 · 2024-10-16T16:09:03.000+01:00
[release-1.11] ✨ govmomi: support vCenter 9
diff --git a/pkg/session/session.go b/pkg/session/session.go
@@ -271,12 +271,10 @@ func (s *Session) GetVersion() (infrav1.VCenterVersion, error) {
 		return "", err
 	}
 
-	switch version.Major {
-	case 6, 7, 8:
+	if version.Major >= 6 {
 		return infrav1.NewVCenterVersion(svcVersion), nil
-	default:
-		return "", unidentifiedVCenterVersion{version: svcVersion}
 	}
+	return "", unidentifiedVCenterVersion{version: svcVersion}
 }
 
 // Clear is meant to destroy all the cached sessions.

Original file line number	Diff line number	Diff line change
`@@ -271,12 +271,10 @@ func (s *Session) GetVersion() (infrav1.VCenterVersion, error) {`
`271`	`271`	`return "", err`
`272`	`272`	`}`
`273`	`273`
`274`		`- switch version.Major {`
`275`		`- case 6, 7, 8:`
	`274`	`+ if version.Major >= 6 {`
`276`	`275`	`return infrav1.NewVCenterVersion(svcVersion), nil`
`277`		`- default:`
`278`		`- return "", unidentifiedVCenterVersion{version: svcVersion}`
`279`	`276`	`}`
	`277`	`+ return "", unidentifiedVCenterVersion{version: svcVersion}`
`280`	`278`	`}`
`281`	`279`
`282`	`280`	`// Clear is meant to destroy all the cached sessions.`