feat: use clusterip instead of DNS for service status check

grafana · Sep 17, 2023 · f3b1f2e · f3b1f2e
1 parent a7c4ff7
commit f3b1f2e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/controllers/k6_start.go b/controllers/k6_start.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -16,8 +17,20 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+// Simplified distinguish between IPv4 and IPv6 addresses
+func isIPv6(ip string) bool {
+	return strings.Contains(ip, ":")
+}
+
+func serviceStatusURI(service *v1.Service) string {
+	if isIPv6(service.Spec.ClusterIP) {
+		return fmt.Sprintf("http://[%s]:6565/v1/status", service.Spec.ClusterIP)
+	}
+	return fmt.Sprintf("http://%s:6565/v1/status", service.Spec.ClusterIP)
+}
+
 func isServiceReady(log logr.Logger, service *v1.Service) bool {
-	resp, err := http.Get(fmt.Sprintf("http://%v.%v.svc.cluster.local:6565/v1/status", service.ObjectMeta.Name, service.ObjectMeta.Namespace))
+	resp, err := http.Get(serviceStatusURI(service))
 
 	if err != nil {
 		log.Error(err, fmt.Sprintf("failed to get status from %v", service.ObjectMeta.Name))

diff --git a/controllers/k6_stopped_jobs.go b/controllers/k6_stopped_jobs.go
@@ -18,7 +18,7 @@ import (
 )
 
 func isJobRunning(log logr.Logger, service *v1.Service) bool {
-	resp, err := http.Get(fmt.Sprintf("http://%v.%v.svc.cluster.local:6565/v1/status", service.ObjectMeta.Name, service.ObjectMeta.Namespace))
+	resp, err := http.Get(serviceStatusURI(service))
 	if err != nil {
 		return false
 	}