Merge pull request #45950 from shyamjvs/revert-proxier

Automatic merge from submit-queue

Make real proxier in hollow-proxy optional (default=true)

Ref https://github.com/kubernetes/kubernetes/pull/45622
This allows using real proxier for hollow proxy, but we use the fake one by default.

cc @kubernetes/sig-scalability-misc @wojtek-t @gmarek
This commit is contained in:
Kubernetes Submit Queue
2017-05-18 07:55:09 -07:00
committed by GitHub
7 changed files with 63 additions and 22 deletions

View File

@@ -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)