From ac6c8d1f0aa0829cefc02a06c674806c1c963975 Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Mon, 27 Sep 2021 17:23:56 +0200 Subject: [PATCH] Set default resource version in tests The resource version is now required: kubernetes-sigs/controller-runtime#1582 ("Fakeclient: Reject Delete with mismatched ResourceVersion"). --- pkg/controller/elasticsearch/driver/fixtures.go | 1 + pkg/controller/elasticsearch/driver/upgrade_test.go | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/controller/elasticsearch/driver/fixtures.go b/pkg/controller/elasticsearch/driver/fixtures.go index 411496a07b..8e1d26a057 100644 --- 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 index bcaa827d68..b3081c9cc0 100644 --- 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{