Set default resource version in tests

The resource version is now required: kubernetes-sigs/controller-runtime#1582 ("Fakeclient: Reject Delete with mismatched ResourceVersion").
elastic · Sep 27, 2021 · ac6c8d1 · ac6c8d1
1 parent 2a4a452
commit ac6c8d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pkg/controller/elasticsearch/driver/fixtures.go b/pkg/controller/elasticsearch/driver/fixtures.go
@@ -37,6 +37,7 @@ func newTestPod(name string) testPod {
 	return testPod{
 		name: name,
 		uid:  uuid.NewUUID(),
+		resourceVersion: "42",
 	}
 }
 

diff --git a/pkg/controller/elasticsearch/driver/upgrade_test.go b/pkg/controller/elasticsearch/driver/upgrade_test.go
@@ -152,9 +152,9 @@ func Test_healthyPods(t *testing.T) {
 			name: "All Pods are healthy",
 			args: args{
 				pods: newUpgradeTestPods(
-					newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
-					newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
-					newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
+					newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
+					newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
+					newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
 				),
 				statefulSets: sset.StatefulSetList{
 					sset.TestSset{
@@ -169,9 +169,9 @@ func Test_healthyPods(t *testing.T) {
 			name: "One Pod is terminating",
 			args: args{
 				pods: newUpgradeTestPods(
-					newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
-					newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).isTerminating(true).withResourceVersion("999"),
-					newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
+					newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
+					newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).isTerminating(true),
+					newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
 				),
 				statefulSets: sset.StatefulSetList{
 					sset.TestSset{