httpproxy uses https when CA_CERT specified

knative · Aug 31, 2022 · fb19e86 · fb19e86
1 parent 8d32902
commit fb19e86
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -368,6 +368,10 @@ function install() {
     if [[ "$INGRESS_CLASS" == "kourier.ingress.networking.knative.dev" ]]; then
       echo "Point Kourier local gateway to custom server certificates"
       toggle_feature cluster-cert-secret server-certs config-kourier
+      # This needs to match the name of Secret in test/config/tls/cert-secret.yaml
+      export CA_CERT=ca-cert
+      # This needs to match $san from test/config/tls/generate.sh
+      export SERVER_NAME=knative.dev
     fi
     echo "Restart activator to mount the certificates"
     kubectl delete pod -n ${SYSTEM_NAMESPACE} -l app=activator

diff --git a/test/e2e/service_to_service_test.go b/test/e2e/service_to_service_test.go
@@ -113,7 +113,7 @@ func testProxyToHelloworld(t *testing.T, clients *test.Clients, helloworldURL *u
 		})
 	}
 
-	caSecretName := os.Getenv("UPSTREAM_CA_CERT")
+	caSecretName := os.Getenv("CA_CERT")
 	if caSecretName != "" {
 		envVars = append(envVars, []corev1.EnvVar{{Name: "CA_CERT", Value: caCertPath},
 			{Name: "SERVER_NAME", Value: os.Getenv("SERVER_NAME")}}...)

diff --git a/test/test_images/httpproxy/httpproxy.go b/test/test_images/httpproxy/httpproxy.go
@@ -64,8 +64,12 @@ func main() {
 		routedHost = gateway
 	}
 
+	scheme := "http"
+	if caCert := os.Getenv("CA_CERT"); caCert != "" {
+		scheme = "https"
+	}
 	target := &url.URL{
-		Scheme: "http",
+		Scheme: scheme,
 		Host:   routedHost,
 	}
 	log.Print("target is ", target)