Skip to content

Commit 33bacfd

Browse files
author
lamai93
committed
Moved function to place where it is used.
1 parent a61e7b0 commit 33bacfd

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

tests/predicates.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ package tests
2525
import (
2626
"fmt"
2727

28+
v1 "k8s.io/api/core/v1"
2829
api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
2930
"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
3031
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,6 +46,22 @@ func deploymentIsReady() func(*api.ArangoDeployment) error {
4546
}
4647
}
4748

49+
func resourcesRequireRotation(wanted, given v1.ResourceRequirements) bool {
50+
checkList := func(wanted, given v1.ResourceList) bool {
51+
for k, v := range wanted {
52+
if gv, ok := given[k]; !ok {
53+
return true
54+
} else if v.Cmp(gv) != 0 {
55+
return true
56+
}
57+
}
58+
59+
return false
60+
}
61+
62+
return checkList(wanted.Limits, given.Limits) || checkList(wanted.Requests, given.Requests)
63+
}
64+
4865
func resourcesAsRequested(kubecli kubernetes.Interface, ns string) func(obj *api.ArangoDeployment) error {
4966
return func(obj *api.ArangoDeployment) error {
5067
return obj.ForeachServerGroup(func(group api.ServerGroup, spec api.ServerGroupSpec, status *api.MemberStatusList) error {

tests/resources_test.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,6 @@ import (
3636
"k8s.io/apimachinery/pkg/api/resource"
3737
)
3838

39-
func resourcesRequireRotation(wanted, given v1.ResourceRequirements) bool {
40-
checkList := func(wanted, given v1.ResourceList) bool {
41-
for k, v := range wanted {
42-
if gv, ok := given[k]; !ok {
43-
return true
44-
} else if v.Cmp(gv) != 0 {
45-
return true
46-
}
47-
}
48-
49-
return false
50-
}
51-
52-
return checkList(wanted.Limits, given.Limits) || checkList(wanted.Requests, given.Requests)
53-
}
54-
5539
func TestResourcesChangeLimitsCluster(t *testing.T) {
5640
longOrSkip(t)
5741
c := client.MustNewInCluster()

0 commit comments

Comments
 (0)