kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5349 from gambol99/api_options 

Aggregator Routing Option
This commit is contained in:
k8s-ci-robot 2018-06-20 01:24:08 -07:00 committed by GitHub
parent 9a4c553fde 9e7b15d01b
commit a92ee72153
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/kops/componentconfig.go
View File

@ -220,6 +220,8 @@ type KubeAPIServerConfig struct {
InsecureBindAddress string `json:"insecureBindAddress,omitempty" flag:"insecure-bind-address"`
// EnableBootstrapAuthToken enables 'bootstrap.kubernetes.io/token' in the 'kube-system' namespace to be used for TLS bootstrapping authentication
EnableBootstrapAuthToken *bool `json:"enableBootstrapTokenAuth,omitempty" flag:"enable-bootstrap-token-auth"`
// EnableAggregatorRouting enables aggregator routing requests to endpoints IP rather than cluster IP
EnableAggregatorRouting *bool `json:"enableAggregatorRouting,omitempty" flag:"enable-aggregator-routing"`
// Deprecated: AdmissionControl is a list of admission controllers to use
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
// EnableAdmissionPlugins is a list of enabled admission plugins

2
pkg/apis/kops/v1alpha1/componentconfig.go
View File

@ -220,6 +220,8 @@ type KubeAPIServerConfig struct {
InsecureBindAddress string `json:"insecureBindAddress,omitempty" flag:"insecure-bind-address"`
// EnableBootstrapAuthToken enables 'bootstrap.kubernetes.io/token' in the 'kube-system' namespace to be used for TLS bootstrapping authentication
EnableBootstrapAuthToken *bool `json:"enableBootstrapTokenAuth,omitempty" flag:"enable-bootstrap-token-auth"`
// EnableAggregatorRouting enables aggregator routing requests to endpoints IP rather than cluster IP
EnableAggregatorRouting *bool `json:"enableAggregatorRouting,omitempty" flag:"enable-aggregator-routing"`
// Deprecated: AdmissionControl is a list of admission controllers to use
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
// EnableAdmissionPlugins is a list of enabled admission plugins

2
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -2108,6 +2108,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.EnableBootstrapAuthToken = in.EnableBootstrapAuthToken
out.EnableAggregatorRouting = in.EnableAggregatorRouting
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
@ -2178,6 +2179,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.EnableBootstrapAuthToken = in.EnableBootstrapAuthToken
out.EnableAggregatorRouting = in.EnableAggregatorRouting
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins

9
pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
View File

@ -1804,6 +1804,15 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
**out = **in
}
}
if in.EnableAggregatorRouting != nil {
in, out := &in.EnableAggregatorRouting, &out.EnableAggregatorRouting
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
if in.AdmissionControl != nil {
in, out := &in.AdmissionControl, &out.AdmissionControl
*out = make([]string, len(*in))

2
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -220,6 +220,8 @@ type KubeAPIServerConfig struct {
InsecureBindAddress string `json:"insecureBindAddress,omitempty" flag:"insecure-bind-address"`
// EnableBootstrapAuthToken enables 'bootstrap.kubernetes.io/token' in the 'kube-system' namespace to be used for TLS bootstrapping authentication
EnableBootstrapAuthToken *bool `json:"enableBootstrapTokenAuth,omitempty" flag:"enable-bootstrap-token-auth"`
// EnableAggregatorRouting enables aggregator routing requests to endpoints IP rather than cluster IP
EnableAggregatorRouting *bool `json:"enableAggregatorRouting,omitempty" flag:"enable-aggregator-routing"`
// Deprecated: AdmissionControl is a list of admission controllers to use
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
// EnableAdmissionPlugins is a list of enabled admission plugins

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -2372,6 +2372,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.EnableBootstrapAuthToken = in.EnableBootstrapAuthToken
out.EnableAggregatorRouting = in.EnableAggregatorRouting
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
@ -2442,6 +2443,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.EnableBootstrapAuthToken = in.EnableBootstrapAuthToken
out.EnableAggregatorRouting = in.EnableAggregatorRouting
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins

9
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View File

@ -1885,6 +1885,15 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
**out = **in
}
}
if in.EnableAggregatorRouting != nil {
in, out := &in.EnableAggregatorRouting, &out.EnableAggregatorRouting
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
if in.AdmissionControl != nil {
in, out := &in.AdmissionControl, &out.AdmissionControl
*out = make([]string, len(*in))

9
pkg/apis/kops/zz_generated.deepcopy.go
View File

@ -2064,6 +2064,15 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
**out = **in
}
}
if in.EnableAggregatorRouting != nil {
in, out := &in.EnableAggregatorRouting, &out.EnableAggregatorRouting
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
if in.AdmissionControl != nil {
in, out := &in.AdmissionControl, &out.AdmissionControl
*out = make([]string, len(*in))