Add e2e testing for http-connect mode

Author: carreter

.github/workflows/e2e.yaml

@@ -58,10 +58,12 @@ jobs:
       REGISTRY: gcr.io/k8s-staging-kas-network-proxy
       KIND_IMAGE: kindest/node${{ matrix.k8s }}
       TAG: master
+      CONNECTION_MODE: ${{ matrix.connection-mode }}
     strategy:
       fail-fast: false
       matrix:
         k8s: [ v1.27.11, v1.28.7, v1.29.2 ]
+        connection-mode: [ grpc, http-connect ]
     steps:
     - name: Install kind
       run: |

Makefile

@@ -56,6 +56,7 @@ DOCKER_CLI_EXPERIMENTAL ?= enabled
 PROXY_SERVER_IP ?= 127.0.0.1
 
 KIND_IMAGE ?= kindest/node
+CONNECTION_MODE ?= grpc
 ## --------------------------------------
 ## Testing
 ## --------------------------------------
@@ -84,7 +85,7 @@ test-integration: build
 
 .PHONY: test-e2e
 test-e2e: docker-build
-	go test -mod=vendor ./e2e -race -agent-image ${AGENT_FULL_IMAGE}-$(TARGETARCH):${TAG} -server-image ${SERVER_FULL_IMAGE}-$(TARGETARCH):${TAG} -kind-image ${KIND_IMAGE}
+	go test -mod=vendor ./e2e -race -agent-image ${AGENT_FULL_IMAGE}-$(TARGETARCH):${TAG} -server-image ${SERVER_FULL_IMAGE}-$(TARGETARCH):${TAG} -kind-image ${KIND_IMAGE} -mode ${CONNECTION_MODE}
 
 ## --------------------------------------
 ## Binaries

e2e/main_test.go

@@ -21,10 +21,11 @@ import (
 )
 
 var (
-	testenv     env.Environment
-	agentImage  = flag.String("agent-image", "", "The proxy agent's docker image.")
-	serverImage = flag.String("server-image", "", "The proxy server's docker image.")
-	kindImage   = flag.String("kind-image", "kindest/node", "Image to use for kind nodes.")
+	testenv        env.Environment
+	agentImage     = flag.String("agent-image", "", "The proxy agent's docker image.")
+	serverImage    = flag.String("server-image", "", "The proxy server's docker image.")
+	kindImage      = flag.String("kind-image", "kindest/node", "Image to use for kind nodes.")
+	connectionMode = flag.String("mode", "grpc", "Connection mode to use during e2e tests.")
 )
 
 func TestMain(m *testing.M) {

e2e/multiserver_multiagent_test.go

@@ -22,24 +22,24 @@ func TestMultiServer_MultiAgent_StaticCount(t *testing.T) {
 		Replicas: 3,
 		Image:    *serverImage,
 		Args: []KeyValue{
-			{Key: "log-file", Value: "/var/log/konnectivity-server.log"},
-			{Key: "logtostderr", Value: "true"},
-			{Key: "log-file-max-size", Value: "0"},
-			{Key: "uds-name", Value: "/etc/kubernetes/konnectivity-server/konnectivity-server.socket"},
+			{"log-file", "/var/log/konnectivity-server.log"},
+			{"logtostderr", "true"},
+			{"log-file-max-size", "0"},
+			{"uds-name", "/etc/kubernetes/konnectivity-server/konnectivity-server.socket"},
 			{Key: "delete-existing-uds-file"},
-			{Key: "cluster-cert", Value: "/etc/kubernetes/pki/apiserver.crt"},
-			{Key: "cluster-key", Value: "/etc/kubernetes/pki/apiserver.key"},
-			{Key: "server-port", Value: "8090"},
-			{Key: "agent-port", Value: "8091"},
-			{Key: "health-port", Value: "8092"},
-			{Key: "admin-port", Value: strconv.Itoa(adminPort)},
-			{Key: "keepalive-time", Value: "1h"},
-			{Key: "mode", Value: "grpc"},
-			{Key: "agent-namespace", Value: "kube-system"},
-			{Key: "agent-service-account", Value: "konnectivity-agent"},
-			{Key: "kubeconfig", Value: "/etc/kubernetes/admin.conf"},
-			{Key: "authentication-audience", Value: "system:konnectivity-server"},
-			{Key: "server-count", Value: "1"},
+			{"cluster-cert", "/etc/kubernetes/pki/apiserver.crt"},
+			{"cluster-key", "/etc/kubernetes/pki/apiserver.key"},
+			{"server-port", "8090"},
+			{"agent-port", "8091"},
+			{"health-port", "8092"},
+			{"admin-port", strconv.Itoa(adminPort)},
+			{"keepalive-time", "1h"},
+			{"mode", *connectionMode},
+			{"agent-namespace", "kube-system"},
+			{"agent-service-account", "konnectivity-agent"},
+			{"kubeconfig", "/etc/kubernetes/admin.conf"},
+			{"authentication-audience", "system:konnectivity-server"},
+			{"server-count", "1"},
 		},
 	}
 	serverStatefulSet, _, err := renderTemplate("server/statefulset.yaml", serverStatefulSetCfg)
@@ -51,16 +51,16 @@ func TestMultiServer_MultiAgent_StaticCount(t *testing.T) {
 		Replicas: 3,
 		Image:    *agentImage,
 		Args: []KeyValue{
-			{Key: "logtostderr", Value: "true"},
-			{Key: "ca-cert", Value: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"},
-			{Key: "proxy-server-host", Value: serverServiceHost},
-			{Key: "proxy-server-port", Value: "8091"},
-			{Key: "sync-interval", Value: "1s"},
-			{Key: "sync-interval-cap", Value: "10s"},
+			{"logtostderr", "true"},
+			{"ca-cert", "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"},
+			{"proxy-server-host", serverServiceHost},
+			{"proxy-server-port", "8091"},
+			{"sync-interval", "1s"},
+			{"sync-interval-cap", "10s"},
 			{Key: "sync-forever"},
-			{Key: "probe-interval", Value: "1s"},
-			{Key: "service-account-token-path", Value: "/var/run/secrets/tokens/konnectivity-agent-token"},
-			{Key: "server-count", Value: "3"},
+			{"probe-interval", "1s"},
+			{"service-account-token-path", "/var/run/secrets/tokens/konnectivity-agent-token"},
+			{"server-count", "3"},
 		},
 	}
 	agentStatefulSet, _, err := renderTemplate("agent/statefulset.yaml", agentStatefulSetConfig)