fix

grafana · Dec 14, 2023 · 7f63ea5 · 7f63ea5
1 parent a6a4744
commit 7f63ea5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/controllers/k6_start.go b/controllers/k6_start.go
@@ -19,11 +19,7 @@ import (
 )
 
 func isServiceReady(log logr.Logger, service *v1.Service) bool {
-<<<<<<< HEAD
 	resp, err := http.Get(fmt.Sprintf("http://%v:6565/v1/status", service.Spec.ClusterIP))
-=======
-	resp, err := http.Get(fmt.Sprintf("http://%v.%v.svc:6565/v1/status", service.ObjectMeta.Name, service.ObjectMeta.Namespace))
->>>>>>> ae9864d (fix dockerfile user)
 
 	if err != nil {
 		log.Error(err, fmt.Sprintf("failed to get status from %v", service.ObjectMeta.Name))