mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Update kube-proxy healthz port in e2e test
This commit is contained in:
		@@ -273,8 +273,8 @@ func (config *NetworkingTestConfig) DialFromNode(protocol, targetIP string, targ
 | 
			
		||||
// GetSelfURL executes a curl against the given path via kubectl exec into a
 | 
			
		||||
// test container running with host networking, and fails if the output
 | 
			
		||||
// doesn't match the expected string.
 | 
			
		||||
func (config *NetworkingTestConfig) GetSelfURL(path string, expected string) {
 | 
			
		||||
	cmd := fmt.Sprintf("curl -q -s --connect-timeout 1 http://localhost:10249%s", path)
 | 
			
		||||
func (config *NetworkingTestConfig) GetSelfURL(port int32, path string, expected string) {
 | 
			
		||||
	cmd := fmt.Sprintf("curl -i -q -s --connect-timeout 1 http://localhost:%d%s", port, path)
 | 
			
		||||
	By(fmt.Sprintf("Getting kube-proxy self URL %s", path))
 | 
			
		||||
 | 
			
		||||
	// These are arbitrary timeouts. The curl command should pass on first try,
 | 
			
		||||
 
 | 
			
		||||
@@ -20,9 +20,11 @@ import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"net/http"
 | 
			
		||||
 | 
			
		||||
	. "github.com/onsi/ginkgo"
 | 
			
		||||
	"k8s.io/apimachinery/pkg/util/sets"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/master/ports"
 | 
			
		||||
	"k8s.io/kubernetes/test/e2e/framework"
 | 
			
		||||
 | 
			
		||||
	. "github.com/onsi/ginkgo"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
var _ = framework.KubeDescribe("Networking", func() {
 | 
			
		||||
@@ -80,8 +82,8 @@ var _ = framework.KubeDescribe("Networking", func() {
 | 
			
		||||
		config := framework.NewNetworkingTestConfig(f)
 | 
			
		||||
 | 
			
		||||
		By("checking kube-proxy URLs")
 | 
			
		||||
		config.GetSelfURL("/healthz", "ok")
 | 
			
		||||
		config.GetSelfURL("/proxyMode", "iptables") // the default
 | 
			
		||||
		config.GetSelfURL(ports.ProxyHealthzPort, "/healthz", "200 OK")
 | 
			
		||||
		config.GetSelfURL(ports.ProxyStatusPort, "/proxyMode", "iptables") // the default
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	// TODO: Remove [Slow] when this has had enough bake time to prove presubmit worthiness.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user