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

Merge pull request #7109 from r0fls/issue-5170 

support apiserver admission-control-config-file flag
This commit is contained in:
Kubernetes Prow Robot 2019-06-11 07:14:24 -07:00 committed by GitHub
parent 825b0db73e 1b3a326d8e
commit c511f6fe4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 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

@ -271,6 +271,8 @@ type KubeAPIServerConfig struct {
EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"` EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"`
// DisableAdmissionPlugins is a list of disabled admission plugins // DisableAdmissionPlugins is a list of disabled admission plugins
DisableAdmissionPlugins []string `json:"disableAdmissionPlugins,omitempty" flag:"disable-admission-plugins"` DisableAdmissionPlugins []string `json:"disableAdmissionPlugins,omitempty" flag:"disable-admission-plugins"`
// AdmissionControlConfigFile is the location of the admission-control-config-file
AdmissionControlConfigFile string `json:"admissionControlConfigFile,omitempty" flag:"admission-control-config-file"`
// ServiceClusterIPRange is the service address range // ServiceClusterIPRange is the service address range
ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"` ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"`
// Passed as --service-node-port-range to kube-apiserver. Expects 'startPort-endPort' format e.g. 30000-33000 // Passed as --service-node-port-range to kube-apiserver. Expects 'startPort-endPort' format e.g. 30000-33000

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

@ -271,6 +271,8 @@ type KubeAPIServerConfig struct {
EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"` EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"`
// DisableAdmissionPlugins is a list of disabled admission plugins // DisableAdmissionPlugins is a list of disabled admission plugins
DisableAdmissionPlugins []string `json:"disableAdmissionPlugins,omitempty" flag:"disable-admission-plugins"` DisableAdmissionPlugins []string `json:"disableAdmissionPlugins,omitempty" flag:"disable-admission-plugins"`
// AdmissionControlConfigFile is the location of the admission-control-config-file
AdmissionControlConfigFile string `json:"admissionControlConfigFile,omitempty" flag:"admission-control-config-file"`
// ServiceClusterIPRange is the service address range // ServiceClusterIPRange is the service address range
ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"` ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"`
// Passed as --service-node-port-range to kube-apiserver. Expects 'startPort-endPort' format e.g. 30000-33000 // Passed as --service-node-port-range to kube-apiserver. Expects 'startPort-endPort' format e.g. 30000-33000

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

@ -2926,6 +2926,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.AppendAdmissionPlugins = in.AppendAdmissionPlugins
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
out.AdmissionControlConfigFile = in.AdmissionControlConfigFile
out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.ServiceNodePortRange = in.ServiceNodePortRange out.ServiceNodePortRange = in.ServiceNodePortRange
out.EtcdServers = in.EtcdServers out.EtcdServers = in.EtcdServers
@ -3016,6 +3017,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.AppendAdmissionPlugins = in.AppendAdmissionPlugins
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
out.AdmissionControlConfigFile = in.AdmissionControlConfigFile
out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.ServiceNodePortRange = in.ServiceNodePortRange out.ServiceNodePortRange = in.ServiceNodePortRange
out.EtcdServers = in.EtcdServers out.EtcdServers = in.EtcdServers

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

@ -271,6 +271,8 @@ type KubeAPIServerConfig struct {
EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"` EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"`
// DisableAdmissionPlugins is a list of disabled admission plugins // DisableAdmissionPlugins is a list of disabled admission plugins
DisableAdmissionPlugins []string `json:"disableAdmissionPlugins,omitempty" flag:"disable-admission-plugins"` DisableAdmissionPlugins []string `json:"disableAdmissionPlugins,omitempty" flag:"disable-admission-plugins"`
// AdmissionControlConfigFile is the location of the admission-control-config-file
AdmissionControlConfigFile string `json:"admissionControlConfigFile,omitempty" flag:"admission-control-config-file"`
// ServiceClusterIPRange is the service address range // ServiceClusterIPRange is the service address range
ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"` ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"`
// Passed as --service-node-port-range to kube-apiserver. Expects 'startPort-endPort' format e.g. 30000-33000 // Passed as --service-node-port-range to kube-apiserver. Expects 'startPort-endPort' format e.g. 30000-33000

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

@ -3196,6 +3196,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.AppendAdmissionPlugins = in.AppendAdmissionPlugins
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
out.AdmissionControlConfigFile = in.AdmissionControlConfigFile
out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.ServiceNodePortRange = in.ServiceNodePortRange out.ServiceNodePortRange = in.ServiceNodePortRange
out.EtcdServers = in.EtcdServers out.EtcdServers = in.EtcdServers
@ -3286,6 +3287,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.AppendAdmissionPlugins = in.AppendAdmissionPlugins
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
out.AdmissionControlConfigFile = in.AdmissionControlConfigFile
out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.ServiceNodePortRange = in.ServiceNodePortRange out.ServiceNodePortRange = in.ServiceNodePortRange
out.EtcdServers = in.EtcdServers out.EtcdServers = in.EtcdServers