Skip to content
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

Check cli version match only for running pods #11295

Merged
merged 3 commits into from
Sep 11, 2023
Merged

Check cli version match only for running pods #11295

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58905f0
Check cli version match only for running pods
mikutas Aug 25, 2023
9bb60a8
Remove containsProxy
mikutas Sep 9, 2023
3956f43
Collapse into single if statement
mikutas Sep 9, 2023
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
5 changes: 3 additions & 2 deletions pkg/healthcheck/healthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ func CheckProxyVersionsUpToDate(pods []corev1.Pod, versions version.Channels) er
outdatedPods := []string{}
for _, pod := range pods {
status := k8s.GetPodStatus(pod)
if status == string(corev1.PodRunning) && containsProxy(pod) {
if status == string(corev1.PodRunning) {
proxyVersion := k8s.GetProxyVersion(pod)
if proxyVersion == "" {
continue
Expand All @@ -1450,8 +1450,9 @@ func CheckProxyVersionsUpToDate(pods []corev1.Pod, versions version.Channels) er
// matches that of the CLI
func CheckIfProxyVersionsMatchWithCLI(pods []corev1.Pod) error {
for _, pod := range pods {
status := k8s.GetPodStatus(pod)
proxyVersion := k8s.GetProxyVersion(pod)
if proxyVersion != "" && proxyVersion != version.Version {
if status == string(corev1.PodRunning) && proxyVersion != "" && proxyVersion != version.Version {
return fmt.Errorf("%s running %s but cli running %s", pod.Name, proxyVersion, version.Version)
}
}
Expand Down