Skip to content

Commit

Permalink
Check cli version match only for running pods (#11295)
Browse files Browse the repository at this point in the history
Fixes #11280

Signed-off-by: Takumi Sue <[email protected]>
  • Loading branch information
mikutas authored Sep 11, 2023
1 parent ff5fabb commit 26dfc6a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkg/healthcheck/healthcheck.go
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

0 comments on commit 26dfc6a

Please sign in to comment.