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

k8s-ci-robot · web-flow · commit a3d29f8197ce · 2024-10-16T16:09:03.000+01:00
[release-1.10] ✨ govmomi: support vCenter 9
diff --git a/pkg/session/session.go b/pkg/session/session.go
@@ -311,12 +311,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
`@@ -311,12 +311,10 @@ func (s *Session) GetVersion() (infrav1.VCenterVersion, error) {`
`311`	`311`	`return "", err`
`312`	`312`	`}`
`313`	`313`
`314`		`- switch version.Major {`
`315`		`- case 6, 7, 8:`
	`314`	`+ if version.Major >= 6 {`
`316`	`315`	`return infrav1.NewVCenterVersion(svcVersion), nil`
`317`		`- default:`
`318`		`- return "", unidentifiedVCenterVersion{version: svcVersion}`
`319`	`316`	`}`
	`317`	`+ return "", unidentifiedVCenterVersion{version: svcVersion}`
`320`	`318`	`}`
`321`	`319`
`322`	`320`	`// Clear is meant to destroy all the cached sessions.`