-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
Fix/upgrade manual #207
Fix/upgrade manual #207
Conversation
18d0ebc
to
fe15f2f
Compare
f228b16
to
e69db6a
Compare
e69db6a
to
2e43006
Compare
520396a
to
1b60827
Compare
1b60827
to
2550acb
Compare
pkg/testcase/daemonset.go
Outdated
@@ -17,6 +18,12 @@ func TestDaemonset(applyWorkload, deleteWorkload bool) { | |||
workloadErr = shared.ManageWorkload("apply", "daemonset.yaml") | |||
Expect(workloadErr).NotTo(HaveOccurred(), "Daemonset manifest not deployed") | |||
} | |||
|
|||
getDeamonset := "kubectl get pods -n test-daemonset" + | |||
" --field-selector=status.phase=Running --kubeconfig=" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is the kubeconfig passed into this command or not? This looks to not be passing it like elsewhere
" --kubeconfig=" + shared.KubeConfigFile)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is being passed on the next line
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To add to Justin's comment, for better readability could we have this getDeamonset+shared.KubeConfigFile
set like in rest of the commands?
pkg/testcase/upgrademanual.go
Outdated
output, err = ms.ManageService(ip, status) | ||
if output != "" { | ||
Expect(output).To(ContainSubstring("active "), | ||
fmt.Sprintf("error checking status %s service for %s node ip: %s", product, nodeType, ip)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shared.LogLevel("error", "") // ?
pkg/testcase/upgrademanual.go
Outdated
output, err := ms.ManageService(ip, status) | ||
if output != "" { | ||
Expect(output).To(ContainSubstring("active "), | ||
fmt.Sprintf("error starting %s service for %s node ip: %s", product, nodeType, ip)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shared.LogLevel("error", "") // ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added expect here so no need to log, will update the expect message
pkg/testcase/upgrademanual.go
Outdated
Expect(output).To(ContainSubstring("active "), | ||
fmt.Sprintf("error starting %s service for %s node ip: %s", product, nodeType, ip)) | ||
} | ||
Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("error starting %s service on %s", product, ip)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shared.LogLevel("error", "") // ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1d57851
to
6d7322c
Compare
6c2773b
to
43a94ff
Compare
pkg/testcase/pod.go
Outdated
pods, err := shared.GetPods(false) | ||
g.Expect(err).NotTo(HaveOccurred()) | ||
g.Expect(pods).NotTo(BeEmpty()) | ||
|
||
res, _ := shared.RunCommandHost(cmd + " --kubeconfig=" + shared.KubeConfigFile) | ||
if res != "" { | ||
shared.LogLevel("info", "Pods not Running or Pending: \n%s", res) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Waiting for the pod status to become "Running".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
} | ||
|
||
return true | ||
}, "600s", "10s").Should(BeTrue(), "failed to process pods status") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we consider rephrasing it to 'Pod is not in the desired state,' since it seems that its the pod's status rather than the processing of it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
43a94ff
to
a0c1ae6
Compare
e698756
to
f0d6503
Compare
Proposed Changes
Types of Changes
Testing
Checklist:
If your PR changes anything on or related to Jenkins, run it pointing to your branch to make sure it's okay.
Verify code lint; we should not have errors.
Update the documentation if needed.
Update makefile and docker run if adding new tests.
Run your tests at least 4 times with all configurations needed and possible.
If needed test with different os types.
Linked Issues
Further Comments