@@ -533,7 +533,7 @@ func TestRedisStatefulSetStorageGeneration(t *testing.T) {
533533 generatedStatefulSet = * ss
534534 }).Return (nil )
535535
536- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
536+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
537537 err := client .EnsureRedisStatefulset (rf , nil , test .ownerRefs )
538538
539539 // Check that the storage-related fields are as expected
@@ -587,7 +587,7 @@ func TestRedisStatefulSetCommands(t *testing.T) {
587587 gotCommands = ss .Spec .Template .Spec .Containers [0 ].Command
588588 }).Return (nil )
589589
590- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
590+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
591591 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
592592
593593 assert .Equal (test .expectedCommands , gotCommands )
@@ -639,7 +639,7 @@ func TestSentinelDeploymentCommands(t *testing.T) {
639639 gotCommands = d .Spec .Template .Spec .Containers [0 ].Command
640640 }).Return (nil )
641641
642- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
642+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
643643 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
644644
645645 assert .Equal (test .expectedCommands , gotCommands )
@@ -687,7 +687,7 @@ func TestRedisStatefulSetPodAnnotations(t *testing.T) {
687687 gotPodAnnotations = ss .Spec .Template .ObjectMeta .Annotations
688688 }).Return (nil )
689689
690- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
690+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
691691 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
692692
693693 assert .Equal (test .expectedPodAnnotations , gotPodAnnotations )
@@ -735,7 +735,7 @@ func TestSentinelDeploymentPodAnnotations(t *testing.T) {
735735 gotPodAnnotations = d .Spec .Template .ObjectMeta .Annotations
736736 }).Return (nil )
737737
738- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
738+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
739739 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
740740
741741 assert .Equal (test .expectedPodAnnotations , gotPodAnnotations )
@@ -777,7 +777,7 @@ func TestRedisStatefulSetServiceAccountName(t *testing.T) {
777777 gotServiceAccountName = ss .Spec .Template .Spec .ServiceAccountName
778778 }).Return (nil )
779779
780- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
780+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
781781 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
782782
783783 assert .Equal (test .expectedServiceAccountName , gotServiceAccountName )
@@ -819,7 +819,7 @@ func TestSentinelDeploymentServiceAccountName(t *testing.T) {
819819 gotServiceAccountName = d .Spec .Template .Spec .ServiceAccountName
820820 }).Return (nil )
821821
822- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
822+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
823823 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
824824
825825 assert .Equal (test .expectedServiceAccountName , gotServiceAccountName )
@@ -1036,7 +1036,7 @@ func TestSentinelService(t *testing.T) {
10361036 generatedService = * s
10371037 }).Return (nil )
10381038
1039- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1039+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
10401040 err := client .EnsureSentinelService (rf , test .rfLabels , []metav1.OwnerReference {{Name : "testing" }})
10411041
10421042 assert .Equal (test .expectedService , generatedService )
@@ -1284,7 +1284,7 @@ func TestRedisService(t *testing.T) {
12841284 generatedService = * s
12851285 }).Return (nil )
12861286
1287- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1287+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
12881288 err := client .EnsureRedisService (rf , test .rfLabels , []metav1.OwnerReference {{Name : "testing" }})
12891289
12901290 assert .Equal (test .expectedService , generatedService )
@@ -1524,7 +1524,7 @@ func TestRedisMasterService(t *testing.T) {
15241524 generatedMasterService = * s
15251525 }).Return (nil )
15261526
1527- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1527+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
15281528 err := client .EnsureRedisMasterService (rf , test .rfLabels , []metav1.OwnerReference {{Name : "testing" }})
15291529
15301530 assert .Equal (test .expectedService , generatedMasterService )
@@ -1764,7 +1764,7 @@ func TestRedisSlaveService(t *testing.T) {
17641764 generatedSlaveService = * s
17651765 }).Return (nil )
17661766
1767- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1767+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
17681768 err := client .EnsureRedisSlaveService (rf , test .rfLabels , []metav1.OwnerReference {{Name : "testing" }})
17691769
17701770 assert .Equal (test .expectedService , generatedSlaveService )
@@ -1813,7 +1813,7 @@ func TestRedisHostNetworkAndDnsPolicy(t *testing.T) {
18131813 actualDnsPolicy = ss .Spec .Template .Spec .DNSPolicy
18141814 }).Return (nil )
18151815
1816- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1816+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
18171817 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
18181818 assert .NoError (err )
18191819
@@ -1862,7 +1862,7 @@ func TestSentinelHostNetworkAndDnsPolicy(t *testing.T) {
18621862 actualDnsPolicy = d .Spec .Template .Spec .DNSPolicy
18631863 }).Return (nil )
18641864
1865- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1865+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
18661866 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
18671867 assert .NoError (err )
18681868
@@ -1912,7 +1912,7 @@ func TestRedisImagePullPolicy(t *testing.T) {
19121912 exporterPolicy = ss .Spec .Template .Spec .Containers [1 ].ImagePullPolicy
19131913 }).Return (nil )
19141914
1915- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1915+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
19161916 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
19171917
19181918 assert .NoError (err )
@@ -1958,7 +1958,7 @@ func TestSentinelImagePullPolicy(t *testing.T) {
19581958 configPolicy = d .Spec .Template .Spec .InitContainers [0 ].ImagePullPolicy
19591959 }).Return (nil )
19601960
1961- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
1961+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
19621962 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
19631963
19641964 assert .NoError (err )
@@ -2033,7 +2033,7 @@ func TestRedisExtraVolumeMounts(t *testing.T) {
20332033 extraVolumeMount = s .Spec .Template .Spec .Containers [0 ].VolumeMounts [4 ]
20342034 }).Return (nil )
20352035
2036- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2036+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
20372037 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
20382038
20392039 assert .NoError (err )
@@ -2108,7 +2108,7 @@ func TestSentinelExtraVolumeMounts(t *testing.T) {
21082108 extraVolumeMount = d .Spec .Template .Spec .Containers [0 ].VolumeMounts [1 ]
21092109 }).Return (nil )
21102110
2111- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2111+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
21122112 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
21132113
21142114 assert .NoError (err )
@@ -2164,7 +2164,7 @@ func TestCustomPort(t *testing.T) {
21642164 port = s .Spec .Template .Spec .Containers [0 ].Ports [0 ]
21652165 }).Return (nil )
21662166
2167- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2167+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
21682168 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
21692169
21702170 assert .NoError (err )
@@ -2246,7 +2246,7 @@ func TestRedisEnv(t *testing.T) {
22462246 env = s .Spec .Template .Spec .Containers [0 ].Env
22472247 }).Return (nil )
22482248
2249- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2249+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
22502250 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
22512251
22522252 assert .NoError (err )
@@ -2298,7 +2298,7 @@ func TestRedisStartupProbe(t *testing.T) {
22982298 startupVolumeMounts = s .Spec .Template .Spec .Containers [0 ].VolumeMounts
22992299 }).Return (nil )
23002300
2301- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2301+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
23022302 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
23032303
23042304 assert .NoError (err )
@@ -2351,7 +2351,7 @@ func TestSentinelStartupProbe(t *testing.T) {
23512351 startupVolumeMounts = d .Spec .Template .Spec .Containers [0 ].VolumeMounts
23522352 }).Return (nil )
23532353
2354- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2354+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
23552355 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
23562356
23572357 assert .NoError (err )
@@ -2434,7 +2434,7 @@ func TestRedisCustomLivenessProbe(t *testing.T) {
24342434 livenessProbe = s .Spec .Template .Spec .Containers [0 ].LivenessProbe
24352435 }).Return (nil )
24362436
2437- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2437+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
24382438 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
24392439
24402440 assert .NoError (err )
@@ -2513,7 +2513,7 @@ func TestSentinelCustomLivenessProbe(t *testing.T) {
25132513 livenessProbe = d .Spec .Template .Spec .Containers [0 ].LivenessProbe
25142514 }).Return (nil )
25152515
2516- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2516+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
25172517 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
25182518
25192519 assert .NoError (err )
@@ -2580,7 +2580,7 @@ func TestRedisCustomReadinessProbe(t *testing.T) {
25802580 readinessProbe = s .Spec .Template .Spec .Containers [0 ].ReadinessProbe
25812581 }).Return (nil )
25822582
2583- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2583+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
25842584 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
25852585
25862586 assert .NoError (err )
@@ -2659,7 +2659,7 @@ func TestSentinelCustomReadinessProbe(t *testing.T) {
26592659 readinessProbe = d .Spec .Template .Spec .Containers [0 ].ReadinessProbe
26602660 }).Return (nil )
26612661
2662- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2662+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
26632663 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
26642664
26652665 assert .NoError (err )
@@ -2718,7 +2718,7 @@ func TestRedisCustomStartupProbe(t *testing.T) {
27182718 startupProbe = s .Spec .Template .Spec .Containers [0 ].StartupProbe
27192719 }).Return (nil )
27202720
2721- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2721+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
27222722 err := client .EnsureRedisStatefulset (rf , nil , []metav1.OwnerReference {})
27232723
27242724 assert .NoError (err )
@@ -2785,7 +2785,7 @@ func TestSentinelCustomStartupProbe(t *testing.T) {
27852785 startupProbe = d .Spec .Template .Spec .Containers [0 ].StartupProbe
27862786 }).Return (nil )
27872787
2788- client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy )
2788+ client := rfservice .NewRedisFailoverKubeClient (ms , log .Dummy , metrics .Dummy , "cluster.local" )
27892789 err := client .EnsureSentinelDeployment (rf , nil , []metav1.OwnerReference {})
27902790
27912791 assert .NoError (err )
0 commit comments