Skip to content

[release-1.27] Make getProxyVersion robust to changes in istioctl proxy-status format #1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 1 commit into from
Nov 20, 2025
Merged

[release-1.27] Make getProxyVersion robust to changes in istioctl proxy-status format #1367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions tests/e2e/controlplane/control_plane_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package controlplane

import (
"fmt"
"regexp"
"strings"
"time"

Expand Down Expand Up @@ -282,15 +283,32 @@ func getProxyVersion(podName, namespace string) (*semver.Version, error) {
}

lines := strings.Split(proxyStatus, "\n")
colSplit := regexp.MustCompile(`\s{2,}`)

versionIdx := -1
headers := colSplit.Split(strings.TrimSpace(lines[0]), -1)
for i, header := range headers {
if header == "VERSION" {
versionIdx = i
break
}
}
if versionIdx == -1 {
return nil, fmt.Errorf("VERSION header not found")
}

var versionStr string
for _, line := range lines {
for _, line := range lines[1:] {
if strings.Contains(line, podName+"."+namespace) {
values := strings.Fields(line)
versionStr = values[len(values)-1]
values := colSplit.Split(strings.TrimSpace(line), -1)
versionStr = values[versionIdx]
break
}
}

if versionStr == "" {
return nil, fmt.Errorf("pod %s not found in proxy status output for namespace %s", podName, namespace)
}
version, err := semver.NewVersion(versionStr)
if err != nil {
return version, fmt.Errorf("error parsing sidecar version %q: %w", versionStr, err)
Expand Down