From 27cb738e42de6234fd7d2e524ea35efdf2460642 Mon Sep 17 00:00:00 2001 From: Rohith Date: Mon, 1 Oct 2018 19:13:07 +0100 Subject: [PATCH] Controller Manager Flag - adding the controller manager flag as this default to bootstrapsigner, tokencleaner disabled --- 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/v1alpha1/zz_generated.deepcopy.go | 13 +++++++++++++ pkg/apis/kops/v1alpha2/componentconfig.go | 2 ++ pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go | 13 +++++++++++++ pkg/apis/kops/validation/aws.go | 1 + pkg/apis/kops/zz_generated.deepcopy.go | 13 +++++++++++++ 9 files changed, 50 insertions(+) diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go index 7d7a145495f27..542371cb191f2 100644 --- a/pkg/apis/kops/componentconfig.go +++ b/pkg/apis/kops/componentconfig.go @@ -376,6 +376,8 @@ type KubeControllerManagerConfig struct { NodeCIDRMaskSize *int32 `json:"nodeCIDRMaskSize,omitempty" flag:"node-cidr-mask-size"` // ConfigureCloudRoutes enables CIDRs allocated with to be configured on the cloud provider. ConfigureCloudRoutes *bool `json:"configureCloudRoutes,omitempty" flag:"configure-cloud-routes"` + // Controllers is a list of controllers to enable on the controller-manager + Controllers *[]string `json:"controllers,omitempty" flag:"controllers"` // CIDRAllocatorType specifies the type of CIDR allocator to use. CIDRAllocatorType *string `json:"cidrAllocatorType,omitempty" flag:"cidr-allocator-type"` // rootCAFile is the root certificate authority will be included in service account's token secret. This must be a valid PEM-encoded CA bundle. diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go index 810c820926361..d13e846b1ba3d 100644 --- a/pkg/apis/kops/v1alpha1/componentconfig.go +++ b/pkg/apis/kops/v1alpha1/componentconfig.go @@ -376,6 +376,8 @@ type KubeControllerManagerConfig struct { NodeCIDRMaskSize *int32 `json:"nodeCIDRMaskSize,omitempty" flag:"node-cidr-mask-size"` // ConfigureCloudRoutes enables CIDRs allocated with to be configured on the cloud provider. ConfigureCloudRoutes *bool `json:"configureCloudRoutes,omitempty" flag:"configure-cloud-routes"` + // Controllers is a list of controllers to enable on the controller-manager + Controllers *[]string `json:"controllers,omitempty" flag:"controllers"` // CIDRAllocatorType specifies the type of CIDR allocator to use. CIDRAllocatorType *string `json:"cidrAllocatorType,omitempty" flag:"cidr-allocator-type"` // rootCAFile is the root certificate authority will be included in service account's token secret. This must be a valid PEM-encoded CA bundle. diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index ca87ea5e5a44c..5762fa6ec9f2d 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -2306,6 +2306,7 @@ func autoConvert_v1alpha1_KubeControllerManagerConfig_To_kops_KubeControllerMana out.AllocateNodeCIDRs = in.AllocateNodeCIDRs out.NodeCIDRMaskSize = in.NodeCIDRMaskSize out.ConfigureCloudRoutes = in.ConfigureCloudRoutes + out.Controllers = in.Controllers out.CIDRAllocatorType = in.CIDRAllocatorType out.RootCAFile = in.RootCAFile if in.LeaderElection != nil { @@ -2347,6 +2348,7 @@ func autoConvert_kops_KubeControllerManagerConfig_To_v1alpha1_KubeControllerMana out.AllocateNodeCIDRs = in.AllocateNodeCIDRs out.NodeCIDRMaskSize = in.NodeCIDRMaskSize out.ConfigureCloudRoutes = in.ConfigureCloudRoutes + out.Controllers = in.Controllers out.CIDRAllocatorType = in.CIDRAllocatorType out.RootCAFile = in.RootCAFile if in.LeaderElection != nil { diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go index ba15249a75d09..11b45dc0c4083 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go @@ -2197,6 +2197,19 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo **out = **in } } + if in.Controllers != nil { + in, out := &in.Controllers, &out.Controllers + if *in == nil { + *out = nil + } else { + *out = new([]string) + if **in != nil { + in, out := *in, *out + *out = make([]string, len(*in)) + copy(*out, *in) + } + } + } if in.CIDRAllocatorType != nil { in, out := &in.CIDRAllocatorType, &out.CIDRAllocatorType if *in == nil { diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go index 49f5c5081ac6d..2d3d71ec3e9f7 100644 --- a/pkg/apis/kops/v1alpha2/componentconfig.go +++ b/pkg/apis/kops/v1alpha2/componentconfig.go @@ -376,6 +376,8 @@ type KubeControllerManagerConfig struct { NodeCIDRMaskSize *int32 `json:"nodeCIDRMaskSize,omitempty" flag:"node-cidr-mask-size"` // ConfigureCloudRoutes enables CIDRs allocated with to be configured on the cloud provider. ConfigureCloudRoutes *bool `json:"configureCloudRoutes,omitempty" flag:"configure-cloud-routes"` + // Controllers is a list of controllers to enable on the controller-manager + Controllers *[]string `json:"controllers,omitempty" flag:"controllers"` // CIDRAllocatorType specifies the type of CIDR allocator to use. CIDRAllocatorType *string `json:"cidrAllocatorType,omitempty" flag:"cidr-allocator-type"` // rootCAFile is the root certificate authority will be included in service account's token secret. This must be a valid PEM-encoded CA bundle. diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 35fd664b97778..6140eba0c4033 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -2570,6 +2570,7 @@ func autoConvert_v1alpha2_KubeControllerManagerConfig_To_kops_KubeControllerMana out.AllocateNodeCIDRs = in.AllocateNodeCIDRs out.NodeCIDRMaskSize = in.NodeCIDRMaskSize out.ConfigureCloudRoutes = in.ConfigureCloudRoutes + out.Controllers = in.Controllers out.CIDRAllocatorType = in.CIDRAllocatorType out.RootCAFile = in.RootCAFile if in.LeaderElection != nil { @@ -2611,6 +2612,7 @@ func autoConvert_kops_KubeControllerManagerConfig_To_v1alpha2_KubeControllerMana out.AllocateNodeCIDRs = in.AllocateNodeCIDRs out.NodeCIDRMaskSize = in.NodeCIDRMaskSize out.ConfigureCloudRoutes = in.ConfigureCloudRoutes + out.Controllers = in.Controllers out.CIDRAllocatorType = in.CIDRAllocatorType out.RootCAFile = in.RootCAFile if in.LeaderElection != nil { diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 19250f4eb4ade..f5caf4cb48107 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -2278,6 +2278,19 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo **out = **in } } + if in.Controllers != nil { + in, out := &in.Controllers, &out.Controllers + if *in == nil { + *out = nil + } else { + *out = new([]string) + if **in != nil { + in, out := *in, *out + *out = make([]string, len(*in)) + copy(*out, *in) + } + } + } if in.CIDRAllocatorType != nil { in, out := &in.CIDRAllocatorType, &out.CIDRAllocatorType if *in == nil { diff --git a/pkg/apis/kops/validation/aws.go b/pkg/apis/kops/validation/aws.go index e34558b8b5dd6..62d1a68ba9f78 100644 --- a/pkg/apis/kops/validation/aws.go +++ b/pkg/apis/kops/validation/aws.go @@ -20,6 +20,7 @@ import ( "strings" "fmt" + "github.com/golang/glog" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index b1c6610ba9958..9bdc8101ecbef 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -2466,6 +2466,19 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo **out = **in } } + if in.Controllers != nil { + in, out := &in.Controllers, &out.Controllers + if *in == nil { + *out = nil + } else { + *out = new([]string) + if **in != nil { + in, out := *in, *out + *out = make([]string, len(*in)) + copy(*out, *in) + } + } + } if in.CIDRAllocatorType != nil { in, out := &in.CIDRAllocatorType, &out.CIDRAllocatorType if *in == nil {