From 1b3a326d8e62de6ec8ef55d5e5fee3b4f12c0272 Mon Sep 17 00:00:00 2001 From: Raphael Deem Date: Thu, 6 Jun 2019 10:17:23 -0700 Subject: [PATCH] support apiserver admission-control-config-file flag --- pkg/apis/kops/componentconfig.go | 2 ++ pkg/apis/kops/v1alpha1/componentconfig.go | 2 ++ pkg/apis/kops/v1alpha1/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha2/componentconfig.go | 2 ++ pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 2 ++ 5 files changed, 10 insertions(+) diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go index 18404019ef..90fa8fc0e9 100644 --- a/pkg/apis/kops/componentconfig.go +++ b/pkg/apis/kops/componentconfig.go @@ -271,6 +271,8 @@ type KubeAPIServerConfig struct { EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"` // DisableAdmissionPlugins is a list of disabled 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 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 diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go index a53749c2d8..1c5e02b027 100644 --- a/pkg/apis/kops/v1alpha1/componentconfig.go +++ b/pkg/apis/kops/v1alpha1/componentconfig.go @@ -271,6 +271,8 @@ type KubeAPIServerConfig struct { EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"` // DisableAdmissionPlugins is a list of disabled 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 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 diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index 666eaeef00..6bf89085ec 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -2926,6 +2926,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins + out.AdmissionControlConfigFile = in.AdmissionControlConfigFile out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceNodePortRange = in.ServiceNodePortRange out.EtcdServers = in.EtcdServers @@ -3016,6 +3017,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins + out.AdmissionControlConfigFile = in.AdmissionControlConfigFile out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceNodePortRange = in.ServiceNodePortRange out.EtcdServers = in.EtcdServers diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go index 2cf5adb744..ab2d323be1 100644 --- a/pkg/apis/kops/v1alpha2/componentconfig.go +++ b/pkg/apis/kops/v1alpha2/componentconfig.go @@ -271,6 +271,8 @@ type KubeAPIServerConfig struct { EnableAdmissionPlugins []string `json:"enableAdmissionPlugins,omitempty" flag:"enable-admission-plugins"` // DisableAdmissionPlugins is a list of disabled 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 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 diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index ea124cdcb9..ad777a4b16 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -3196,6 +3196,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins + out.AdmissionControlConfigFile = in.AdmissionControlConfigFile out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceNodePortRange = in.ServiceNodePortRange out.EtcdServers = in.EtcdServers @@ -3286,6 +3287,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko out.AppendAdmissionPlugins = in.AppendAdmissionPlugins out.EnableAdmissionPlugins = in.EnableAdmissionPlugins out.DisableAdmissionPlugins = in.DisableAdmissionPlugins + out.AdmissionControlConfigFile = in.AdmissionControlConfigFile out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceNodePortRange = in.ServiceNodePortRange out.EtcdServers = in.EtcdServers