Skip to content

Commit ac6c8d1

Browse files
committed
Set default resource version in tests
The resource version is now required: kubernetes-sigs/controller-runtime#1582 ("Fakeclient: Reject Delete with mismatched ResourceVersion").
1 parent 2a4a452 commit ac6c8d1

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pkg/controller/elasticsearch/driver/fixtures.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func newTestPod(name string) testPod {
3737
return testPod{
3838
name: name,
3939
uid: uuid.NewUUID(),
40+
resourceVersion: "42",
4041
}
4142
}
4243

pkg/controller/elasticsearch/driver/upgrade_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ func Test_healthyPods(t *testing.T) {
152152
name: "All Pods are healthy",
153153
args: args{
154154
pods: newUpgradeTestPods(
155-
newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
156-
newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
157-
newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
155+
newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
156+
newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
157+
newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
158158
),
159159
statefulSets: sset.StatefulSetList{
160160
sset.TestSset{
@@ -169,9 +169,9 @@ func Test_healthyPods(t *testing.T) {
169169
name: "One Pod is terminating",
170170
args: args{
171171
pods: newUpgradeTestPods(
172-
newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
173-
newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).isTerminating(true).withResourceVersion("999"),
174-
newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).withResourceVersion("999"),
172+
newTestPod("masters-2").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
173+
newTestPod("masters-1").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true).isTerminating(true),
174+
newTestPod("masters-0").inStatefulset("masters").isMaster(true).isData(false).isHealthy(true).needsUpgrade(true).isInCluster(true),
175175
),
176176
statefulSets: sset.StatefulSetList{
177177
sset.TestSset{

0 commit comments

Comments
 (0)