github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119251 from soltysh/issue119230

Browse Source 
Match both old and new kubectl version for a while in e2e
This commit is contained in:
Kubernetes Prow Robot 2023-07-12 04:51:12 -07:00 committed by GitHub
commit 0da0b7a85d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/kubectl/kubectl.go
View File

@ -1676,7 +1676,12 @@ metadata:
// we expect following values for: Major -> digit, Minor -> numeric followed by an optional '+', GitCommit -> alphanumeric // we expect following values for: Major -> digit, Minor -> numeric followed by an optional '+', GitCommit -> alphanumeric
requiredItems := []string{"Client Version: ", "Server Version: "} requiredItems := []string{"Client Version: ", "Server Version: "}
for _, item := range requiredItems { for _, item := range requiredItems {
if matched, _ := regexp.MatchString(item+`v\d\.\d+\.[\d\w\-\.\+]+`, versionString); !matched { // prior to 1.28 we printed long version information
oldMatched, _ := regexp.MatchString(item+`version.Info\{Major:"\d", Minor:"\d+\+?", GitVersion:"v\d\.\d+\.[\d\w\-\.\+]+", GitCommit:"[0-9a-f]+"`, versionString)
// 1.28+ prints short information
newMatched, _ := regexp.MatchString(item+`v\d\.\d+\.[\d\w\-\.\+]+`, versionString)
// due to backwards compatibility we need to match both until 1.30 most likely
if !oldMatched && !newMatched {
framework.Failf("Item %s value is not valid in %s\n", item, versionString) framework.Failf("Item %s value is not valid in %s\n", item, versionString)
} }
} }