Merge pull request kubernetes#85095 from liggitt/protocol_errors

k8s-ci-robot · web-flow · commit cf06a2efd6ec · 2019-11-11T14:46:58.000-08:00
Plumb configured acceptContentType to client config
diff --git a/cmd/cloud-controller-manager/app/options/options.go b/cmd/cloud-controller-manager/app/options/options.go
@@ -180,6 +180,7 @@ func (o *CloudControllerManagerOptions) ApplyTo(c *cloudcontrollerconfig.Config,
 		return err
 	}
 	c.Kubeconfig.DisableCompression = true
+	c.Kubeconfig.ContentConfig.AcceptContentTypes = o.Generic.ClientConnection.AcceptContentTypes
 	c.Kubeconfig.ContentConfig.ContentType = o.Generic.ClientConnection.ContentType
 	c.Kubeconfig.QPS = o.Generic.ClientConnection.QPS
 	c.Kubeconfig.Burst = int(o.Generic.ClientConnection.Burst)
diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go
@@ -403,6 +403,7 @@ func (s KubeControllerManagerOptions) Config(allControllers []string, disabledBy
 		return nil, err
 	}
 	kubeconfig.DisableCompression = true
+	kubeconfig.ContentConfig.AcceptContentTypes = s.Generic.ClientConnection.AcceptContentTypes
 	kubeconfig.ContentConfig.ContentType = s.Generic.ClientConnection.ContentType
 	kubeconfig.QPS = s.Generic.ClientConnection.QPS
 	kubeconfig.Burst = int(s.Generic.ClientConnection.Burst)

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,7 @@ func (o CloudControllerManagerOptions) ApplyTo(c cloudcontrollerconfig.Config,`
`180`	`180`	`return err`
`181`	`181`	`}`
`182`	`182`	`c.Kubeconfig.DisableCompression = true`
	`183`	`+ c.Kubeconfig.ContentConfig.AcceptContentTypes = o.Generic.ClientConnection.AcceptContentTypes`
`183`	`184`	`c.Kubeconfig.ContentConfig.ContentType = o.Generic.ClientConnection.ContentType`
`184`	`185`	`c.Kubeconfig.QPS = o.Generic.ClientConnection.QPS`
`185`	`186`	`c.Kubeconfig.Burst = int(o.Generic.ClientConnection.Burst)`
Original file line number	Diff line number	Diff line change
`@@ -403,6 +403,7 @@ func (s KubeControllerManagerOptions) Config(allControllers []string, disabledBy`
`403`	`403`	`return nil, err`
`404`	`404`	`}`
`405`	`405`	`kubeconfig.DisableCompression = true`
	`406`	`+ kubeconfig.ContentConfig.AcceptContentTypes = s.Generic.ClientConnection.AcceptContentTypes`
`406`	`407`	`kubeconfig.ContentConfig.ContentType = s.Generic.ClientConnection.ContentType`
`407`	`408`	`kubeconfig.QPS = s.Generic.ClientConnection.QPS`
`408`	`409`	`kubeconfig.Burst = int(s.Generic.ClientConnection.Burst)`