use podIP if service name is empty

Author: bakito

pkg/config/types.go

@@ -22,11 +22,11 @@ type Config struct {
 	StartupDelay          time.Duration     `json:"startupDelay"`
 	Metrics               Metrics           `json:"metrics"`
 	// LatestMetricsLabel if true, each result metric is also created with executionID=latest
-	LatestMetricsLabel  bool                   `json:"latestMetricsLabel"`
-	Custom              map[string]interface{} `json:"custom"`
-	CallbackServiceName string                 `json:"callbackServiceName"`
-	CallbackServicePort int                    `json:"callbackServicePort"`
-	UsePodIPForCallback bool                   `json:"usePodIPForCallback"`
+	LatestMetricsLabel bool                   `json:"latestMetricsLabel"`
+	Custom             map[string]interface{} `json:"custom"`
+	// CallbackServiceName if left blank, the pod IP is used for callback
+	CallbackServiceName string `json:"callbackServiceName"`
+	CallbackServicePort int    `json:"callbackServicePort"`
 	// LeaderElectionResourceLock resource lock type. if empty default (resourcelock.ConfigMapsLeasesResourceLock) is used
 	LeaderElectionResourceLock string `json:"leaderElectionResourceLock,omitempty"`
 

pkg/cron/cron.go

@@ -3,6 +3,7 @@ package cron
 import (
 	"context"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/bakito/batch-job-controller/pkg/config"
@@ -122,7 +123,7 @@ func (j *cronJob) startPods() {
 	}
 
 	var callbackAddress string
-	if j.cfg.UsePodIPForCallback {
+	if len(strings.TrimSpace(j.cfg.CallbackServiceName)) == 0 {
 		// get my pod
 		p := &corev1.Pod{}
 		name := os.Getenv("HOSTNAME")

pkg/cron/cron_test.go

@@ -72,7 +72,6 @@ var _ = Describe("Cron", func() {
 			mockController.EXPECT().AllAdded(gm.Any())
 			mockController.EXPECT().AddPod(gm.Any())
 			mockClient.EXPECT().DeleteAllOf(gm.Any(), gm.Any(), gm.Any(), gm.Any(), gm.Any())
-			mockClient.EXPECT().Get(gm.Any(), gm.Any(), gm.AssignableToTypeOf(&corev1.Service{}))
 			mockClient.EXPECT().List(gm.Any(), gm.AssignableToTypeOf(&corev1.NodeList{}), client.MatchingLabels(nodeSelector)).
 				Do(func(ctx context.Context, list *corev1.NodeList, opts ...client.ListOption) error {
 					list.Items = []corev1.Node{
@@ -93,7 +92,16 @@ var _ = Describe("Cron", func() {
 					return nil
 				})
 		})
-		It("should start all pods", func() {
+		It("should start all pods with service IP for callback", func() {
+			cj.cfg.CallbackServiceName = "any-service-name"
+			mockClient.EXPECT().Get(gm.Any(), gm.Any(), gm.AssignableToTypeOf(&corev1.Service{}))
+			mockLog.EXPECT().WithValues("id", id).Return(mockLog)
+			mockLog.EXPECT().Info("executing job")
+			cj.startPods()
+		})
+		It("should start all pods with pod IP for callback", func() {
+			cj.cfg.CallbackServiceName = " "
+			mockClient.EXPECT().Get(gm.Any(), gm.Any(), gm.AssignableToTypeOf(&corev1.Pod{}))
 			mockLog.EXPECT().WithValues("id", id).Return(mockLog)
 			mockLog.EXPECT().Info("executing job")
 			cj.startPods()