From c83718a0796861ad30c43d6f2d08460d15891876 Mon Sep 17 00:00:00 2001 From: Zhang Zhao Date: Wed, 7 Aug 2024 14:33:52 -0700 Subject: [PATCH 1/2] Fix IPv6 compatibility issue with starter pod --- pkg/resources/containers/curl_start.go | 3 ++- pkg/resources/containers/curl_stop.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/resources/containers/curl_start.go b/pkg/resources/containers/curl_start.go index ca14b0d8..334d3309 100644 --- a/pkg/resources/containers/curl_start.go +++ b/pkg/resources/containers/curl_start.go @@ -3,6 +3,7 @@ package containers import ( "encoding/json" "fmt" + "net" "strings" "github.com/grafana/k6-operator/pkg/types" @@ -26,7 +27,7 @@ func NewStartContainer(hostnames []string, image string, imagePullPolicy corev1. var parts []string for _, hostname := range hostnames { - parts = append(parts, fmt.Sprintf("curl --retry 3 -X PATCH -H 'Content-Type: application/json' http://%s:6565/v1/status -d '%s'", hostname, req)) + parts = append(parts, fmt.Sprintf("curl --retry 3 -X PATCH -H 'Content-Type: application/json' http://%s/v1/status -d '%s'", net.JoinHostPort(hostname, "6565"), req)) } return corev1.Container{ diff --git a/pkg/resources/containers/curl_stop.go b/pkg/resources/containers/curl_stop.go index 638055a4..78bf1429 100644 --- a/pkg/resources/containers/curl_stop.go +++ b/pkg/resources/containers/curl_stop.go @@ -3,6 +3,7 @@ package containers import ( "encoding/json" "fmt" + "net" "strings" "github.com/grafana/k6-operator/pkg/types" @@ -26,7 +27,7 @@ func NewStopContainer(hostnames []string, image string, imagePullPolicy corev1.P var parts []string for _, hostname := range hostnames { - parts = append(parts, fmt.Sprintf("curl --retry 3 -X PATCH -H 'Content-Type: application/json' http://%s:6565/v1/status -d '%s'", hostname, req)) + parts = append(parts, fmt.Sprintf("curl --retry 3 -X PATCH -H 'Content-Type: application/json' http://%s/v1/status -d '%s'", net.JoinHostPort(hostname, "6565"), req)) } return corev1.Container{ From 744230861088f5f218d5eef0c8b687e3fae43f50 Mon Sep 17 00:00:00 2001 From: Zhang Zhao Date: Sat, 31 Aug 2024 00:24:35 -0700 Subject: [PATCH 2/2] add local cluster config via kind --- e2e/ipv6/kind-ipv6.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 e2e/ipv6/kind-ipv6.yaml diff --git a/e2e/ipv6/kind-ipv6.yaml b/e2e/ipv6/kind-ipv6.yaml new file mode 100644 index 00000000..2ad5f7f8 --- /dev/null +++ b/e2e/ipv6/kind-ipv6.yaml @@ -0,0 +1,5 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +networking: + ipFamily: ipv6 + apiServerAddress: 127.0.0.1