Skip to content

K
k3s
Commit bdc4540e authored by Anthony Yeh's avatar Anthony Yeh
Browse files
Options

e2e/framework: Deflake cleanup of RCs in service_util.

The previous Get/Update pattern with no retry on resource version mismatch would flake with the following error: "the object has been modified; please apply your changes to the latest version and try again"
parent a94c67d6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
test/e2e/framework/service_util.go
View file @ bdc4540e
...@@ -844,15 +844,11 @@ func (t *ServiceTestFixture) Cleanup() []error { ...@@ -844,15 +844,11 @@ func (t *ServiceTestFixture) Cleanup() []error {
for rcName := range t.rcs { for rcName := range t.rcs {
By("stopping RC " + rcName + " in namespace " + t.Namespace) By("stopping RC " + rcName + " in namespace " + t.Namespace)
// First, resize the RC to 0. // First, resize the RC to 0.
old, err := t.Client.Core().ReplicationControllers(t.Namespace).Get(rcName, metav1.GetOptions{}) patch := `{"spec":{"replicas":0}}`
_, err := t.Client.Core().ReplicationControllers(t.Namespace).Patch(rcName, types.StrategicMergePatchType, []byte(patch))
if err != nil { if err != nil {
errs = append(errs, err) errs = append(errs, err)
} }
x := int32(0)
old.Spec.Replicas = &x
if _, err := t.Client.Core().ReplicationControllers(t.Namespace).Update(old); err != nil {
errs = append(errs, err)
}
// TODO(mikedanese): Wait. // TODO(mikedanese): Wait.
// Then, delete the RC altogether. // Then, delete the RC altogether.
if err := t.Client.Core().ReplicationControllers(t.Namespace).Delete(rcName, nil); err != nil { if err := t.Client.Core().ReplicationControllers(t.Namespace).Delete(rcName, nil); err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment