dapr
/
cli
mirror of https://github.com/dapr/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix scheduler pod count for 1.15 version when testing master and latest 

Signed-off-by: Anton Troshin <anton@diagrid.io>
This commit is contained in:
Anton Troshin 2025-02-19 19:51:48 -06:00
parent 0cd0585b64
commit 4928053cbc
No known key found for this signature in database
GPG Key ID: 9F8A96ACA9EB6363
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/e2e/common/common.go
View File

@ -47,17 +47,21 @@ const (
ClusterRoles ClusterRoles
ClusterRoleBindings ClusterRoleBindings
numHAPodsWithScheduler = 16 numHAPodsWithScheduler = 16
numHAPodsOld = 13 numHAPodsOld = 13
numNonHAPodsWithScheduler = 6 numNonHAPodsWithHAScheduler = 8
numNonHAPodsOld = 5 numNonHAPodsWithScheduler = 6
numNonHAPodsOld = 5
thirdPartyDevNamespace = "default" thirdPartyDevNamespace = "default"
devRedisReleaseName = "dapr-dev-redis" devRedisReleaseName = "dapr-dev-redis"
devZipkinReleaseName = "dapr-dev-zipkin" devZipkinReleaseName = "dapr-dev-zipkin"
) )
var VersionWithScheduler = semver.MustParse("1.14.0-rc.1") var (
VersionWithScheduler = semver.MustParse("1.14.0-rc.1")
VersionWithHAScheduler = semver.MustParse("1.15.0-rc.1")
)
type VersionDetails struct { type VersionDetails struct {
RuntimeVersion string RuntimeVersion string
@ -1232,23 +1236,26 @@ func getVersionedNumberOfPods(isHAEnabled bool, details VersionDetails) (int, er
return 0, err return 0, err
} }
if rv.LessThan(VersionWithScheduler) { if rv.GreaterThanEqual(VersionWithScheduler) {
return numHAPodsOld, nil return numHAPodsWithScheduler, nil
} }
return numHAPodsWithScheduler, nil return numHAPodsOld, nil
} else { } else {
if details.UseDaprLatestVersion { if details.UseDaprLatestVersion {
return numNonHAPodsWithScheduler, nil return numNonHAPodsWithHAScheduler, nil
} }
rv, err := semver.NewVersion(details.RuntimeVersion) rv, err := semver.NewVersion(details.RuntimeVersion)
if err != nil { if err != nil {
return 0, err return 0, err
} }
if rv.LessThan(VersionWithScheduler) { if rv.GreaterThanEqual(VersionWithHAScheduler) {
return numNonHAPodsOld, nil return numNonHAPodsWithHAScheduler, nil
} }
return numNonHAPodsWithScheduler, nil if rv.GreaterThanEqual(VersionWithScheduler) {
return numNonHAPodsWithScheduler, nil
}
return numNonHAPodsOld, nil
} }
} }