???

replicatedhq · Sep 18, 2024 · 0948a2e · 0948a2e
1 parent 1d1e1f8
commit 0948a2e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cmd/embedded-cluster/proxy.go b/cmd/embedded-cluster/proxy.go
@@ -113,7 +113,7 @@ func maybePromptForNoProxy(c *cli.Context, proxy *ecv1beta1.ProxySpec) (*ecv1bet
 				logrus.Infof("no-proxy was not set, using default no proxy %s", cleanDefaultIPNet)
 				proxy.ProvidedNoProxy = cleanDefaultIPNet
 				regenerateNoProxy(c, proxy)
-				logrus.Infof("final no-proxy is %q", proxy.NoProxy)
+				logrus.Infof("final (default) no-proxy is %q", proxy.NoProxy)
 				return proxy, nil
 			} else {
 				return promptForNoProxy(c, proxy, cleanDefaultIPNet, defaultIPNet.IP.String())
@@ -157,6 +157,7 @@ func promptForNoProxy(c *cli.Context, proxy *ecv1beta1.ProxySpec, subnet, IP str
 	}
 	proxy.ProvidedNoProxy = newProxy
 	regenerateNoProxy(c, proxy)
+	fmt.Printf("final (provided) no-proxy is %q\n", proxy.NoProxy)
 	return proxy, nil
 }
 

diff --git a/e2e/proxy_test.go b/e2e/proxy_test.go
@@ -35,6 +35,7 @@ func TestProxiedEnvironment(t *testing.T) {
 	line := []string{"single-node-install.sh", "ui"}
 	line = append(line, "--http-proxy", cluster.HTTPProxy)
 	line = append(line, "--https-proxy", cluster.HTTPProxy)
+	line = append(line, "--no-proxy", "10.0.0.0/25") // test with half the default subnet, because the proxy is within the subnet otherwise
 	if _, _, err := RunCommandOnNode(t, tc, 0, line, withProxyEnv(tc.IPs)); err != nil {
 		t.Fatalf("fail to install embedded-cluster on node %s: %v", tc.Nodes[0], err)
 	}