Merge pull request #45950 from shyamjvs/revert-proxier

cluster/kubemark/gce/config-default.sh

@@ -79,6 +79,7 @@ if [ -n "${STORAGE_MEDIA_TYPE:-}" ]; then
 fi
 
 ENABLE_GARBAGE_COLLECTOR=${ENABLE_GARBAGE_COLLECTOR:-true}
+USE_REAL_PROXIER=${USE_REAL_PROXIER:-true}  # for hollow-proxy
 
 KUBELET_TEST_ARGS="--max-pods=100 $TEST_CLUSTER_LOG_LEVEL ${TEST_CLUSTER_API_CONTENT_TYPE}"
 APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${API_SERVER_TEST_LOG_LEVEL} ${TEST_CLUSTER_STORAGE_MEDIA_TYPE} ${TEST_CLUSTER_MAX_REQUESTS_INFLIGHT} ${TEST_CLUSTER_DELETE_COLLECTION_WORKERS} --enable-garbage-collector=${ENABLE_GARBAGE_COLLECTOR}"

cmd/kubemark/hollow-node.go

@@ -52,6 +52,7 @@ type HollowNodeConfig struct {
 	NodeName            string
 	ServerPort          int
 	ContentType         string
+	UseRealProxier      bool
 }
 
 const (
@@ -70,6 +71,7 @@ func (c *HollowNodeConfig) addFlags(fs *pflag.FlagSet) {
 	fs.IntVar(&c.ServerPort, "api-server-port", 443, "Port on which API server is listening.")
 	fs.StringVar(&c.Morph, "morph", "", fmt.Sprintf("Specifies into which Hollow component this binary should morph. Allowed values: %v", knownMorphs.List()))
 	fs.StringVar(&c.ContentType, "kube-api-content-type", "application/vnd.kubernetes.protobuf", "ContentType of requests sent to apiserver.")
+	fs.BoolVar(&c.UseRealProxier, "use-real-proxier", true, "Set to true if you want to use real proxier inside hollow-proxy.")
 }
 
 func (c *HollowNodeConfig) createClientConfigFromFile() (*restclient.Config, error) {
@@ -151,6 +153,7 @@ func main() {
 			execer,
 			eventBroadcaster,
 			recorder,
+			config.UseRealProxier,
 		)
 		if err != nil {
 			glog.Fatalf("Failed to create hollowProxy instance: %v", err)

hack/verify-flags/known-flags.txt

@@ -704,6 +704,7 @@ upgrade-target
 use-kubernetes-cluster-service
 use-kubernetes-version
 use-legacy-policy-config
+use-real-proxier
 use-service-account-credentials
 user-whitelist
 use-service-account-credentials

pkg/kubemark/BUILD

@@ -29,6 +29,8 @@ go_library(
         "//pkg/kubelet/container/testing:go_default_library",
         "//pkg/kubelet/dockershim/libdocker:go_default_library",
         "//pkg/kubelet/types:go_default_library",
+        "//pkg/proxy:go_default_library",
+        "//pkg/proxy/config:go_default_library",
         "//pkg/proxy/iptables:go_default_library",
         "//pkg/util:go_default_library",
         "//pkg/util/exec:go_default_library",

pkg/kubemark/hollow_proxy.go

@@ -27,7 +27,10 @@ import (
 	clientv1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/record"
 	proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app"
+	"k8s.io/kubernetes/pkg/api"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	"k8s.io/kubernetes/pkg/proxy"
+	proxyconfig "k8s.io/kubernetes/pkg/proxy/config"
 	"k8s.io/kubernetes/pkg/proxy/iptables"
 	"k8s.io/kubernetes/pkg/util"
 	utilexec "k8s.io/kubernetes/pkg/util/exec"
@@ -42,6 +45,21 @@ type HollowProxy struct {
 	ProxyServer *proxyapp.ProxyServer
 }
 
+type FakeProxier struct{}
+
+func (*FakeProxier) Sync() {}
+func (*FakeProxier) SyncLoop() {
+	select {}
+}
+func (*FakeProxier) OnServiceAdd(service *api.Service)                        {}
+func (*FakeProxier) OnServiceUpdate(oldService, service *api.Service)         {}
+func (*FakeProxier) OnServiceDelete(service *api.Service)                     {}
+func (*FakeProxier) OnServiceSynced()                                         {}
+func (*FakeProxier) OnEndpointsAdd(endpoints *api.Endpoints)                  {}
+func (*FakeProxier) OnEndpointsUpdate(oldEndpoints, endpoints *api.Endpoints) {}
+func (*FakeProxier) OnEndpointsDelete(endpoints *api.Endpoints)               {}
+func (*FakeProxier) OnEndpointsSynced()                                       {}
+
 func NewHollowProxyOrDie(
 	nodeName string,
 	client clientset.Interface,
@@ -51,34 +69,49 @@ func NewHollowProxyOrDie(
 	execer utilexec.Interface,
 	broadcaster record.EventBroadcaster,
 	recorder record.EventRecorder,
+	useRealProxier bool,
 ) (*HollowProxy, error) {
-	// Create a proxier with fake iptables underneath it.
-	proxier, err := iptables.NewProxier(
-		iptInterface,
-		sysctl,
-		execer,
-		30*time.Second,
-		5*time.Second,
-		false,
-		0,
-		"10.0.0.0/8",
-		nodeName,
-		getNodeIP(client, nodeName),
-		recorder,
-		nil,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("unable to create proxier: %v", err)
+	// Create proxier and service/endpoint handlers.
+	var proxier proxy.ProxyProvider
+	var serviceHandler proxyconfig.ServiceHandler
+	var endpointsHandler proxyconfig.EndpointsHandler
+
+	if useRealProxier {
+		// Real proxier with fake iptables, sysctl, etc underneath it.
+		//var err error
+		proxierIPTables, err := iptables.NewProxier(
+			iptInterface,
+			sysctl,
+			execer,
+			30*time.Second,
+			5*time.Second,
+			false,
+			0,
+			"10.0.0.0/8",
+			nodeName,
+			getNodeIP(client, nodeName),
+			recorder,
+			nil,
+		)
+		if err != nil {
+			return nil, fmt.Errorf("unable to create proxier: %v", err)
+		}
+		proxier = proxierIPTables
+		serviceHandler = proxierIPTables
+		endpointsHandler = proxierIPTables
+	} else {
+		proxier = &FakeProxier{}
+		serviceHandler = &FakeProxier{}
+		endpointsHandler = &FakeProxier{}
 	}
 
-	// Create and start Hollow Proxy
+	// Create a Hollow Proxy instance.
 	nodeRef := &clientv1.ObjectReference{
 		Kind:      "Node",
 		Name:      nodeName,
 		UID:       types.UID(nodeName),
 		Namespace: "",
 	}
-
 	return &HollowProxy{
 		ProxyServer: &proxyapp.ProxyServer{
 			Client:                client,
@@ -92,8 +125,8 @@ func NewHollowProxyOrDie(
 			OOMScoreAdj:           util.Int32Ptr(0),
 			ResourceContainer:     "",
 			ConfigSyncPeriod:      30 * time.Second,
-			ServiceEventHandler:   proxier,
-			EndpointsEventHandler: proxier,
+			ServiceEventHandler:   serviceHandler,
+			EndpointsEventHandler: endpointsHandler,
 		},
 	}, nil
 }

test/kubemark/resources/hollow-node_template.yaml

@@ -79,7 +79,7 @@ spec:
         command:
         - /bin/sh
         - -c
-        - /kubemark --morph=proxy --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --alsologtostderr {{kubeproxy_verbosity_level}} 1>>/var/log/kubeproxy-$(NODE_NAME).log 2>&1
+        - /kubemark --morph=proxy --name=$(NODE_NAME) --use-real-proxier={{use_real_proxier}} --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --alsologtostderr {{kubeproxy_verbosity_level}} 1>>/var/log/kubeproxy-$(NODE_NAME).log 2>&1
         volumeMounts:
         - name: kubeconfig-volume
           mountPath: /kubeconfig

test/kubemark/start-kubemark.sh

@@ -322,6 +322,7 @@ current-context: kubemark-context")
   sed -i'' -e "s/{{master_ip}}/${MASTER_IP}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
   sed -i'' -e "s/{{kubelet_verbosity_level}}/${KUBELET_TEST_LOG_LEVEL}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
   sed -i'' -e "s/{{kubeproxy_verbosity_level}}/${KUBEPROXY_TEST_LOG_LEVEL}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
+  sed -i'' -e "s/{{use_real_proxier}}/${USE_REAL_PROXIER}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
   "${KUBECTL}" create -f "${RESOURCE_DIRECTORY}/hollow-node.yaml" --namespace="kubemark"
 
   echo "Created secrets, configMaps, replication-controllers required for hollow-nodes."