From 588d15db8fdafb39fa6deb9faad40172ea0ffefe Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 17 Dec 2021 19:04:38 +0100 Subject: [PATCH] Remove Disables, Skips and DisableKubeProxy from the comparing configs Signed-off-by: Manuel Buil --- pkg/daemons/config/types.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/daemons/config/types.go b/pkg/daemons/config/types.go index a03bbaf522..6f6014fd55 100644 --- a/pkg/daemons/config/types.go +++ b/pkg/daemons/config/types.go @@ -113,15 +113,12 @@ type CriticalControlArgs struct { ClusterIPRange *net.IPNet DisableCCM bool DisableHelmController bool - DisableKubeProxy bool DisableNPC bool - Disables map[string]bool DisableServiceLB bool FlannelBackend string NoCoreDNS bool ServiceIPRange *net.IPNet ServiceIPRanges []*net.IPNet - Skips map[string]bool } type Control struct { @@ -142,9 +139,11 @@ type Control struct { KubeConfigMode string DataDir string Datastore endpoint.Config + Disables map[string]bool DisableAPIServer bool DisableControllerManager bool DisableETCD bool + DisableKubeProxy bool DisableScheduler bool ExtraAPIArgs []string ExtraControllerArgs []string @@ -155,6 +154,7 @@ type Control struct { JoinURL string IPSECPSK string DefaultLocalStoragePath string + Skips map[string]bool SystemDefaultRegistry string ClusterInit bool ClusterReset bool