Merge pull request #4774 from manuelbuil/fix-rke2-ha-engine

[k3s-engine] Remove Disables, Skips and DisableKubeProxy from the critical configs
pull/4795/head
Manuel Buil 2021-12-17 19:10:24 +01:00 committed by GitHub
commit 7e79ba7afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -110,15 +110,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,7 +139,9 @@ type Control struct {
DisableAPIServer bool
DisableControllerManager bool
DisableETCD bool
DisableKubeProxy bool
DisableScheduler bool
Disables map[string]bool
ExtraAPIArgs []string
ExtraControllerArgs []string
ExtraCloudControllerArgs []string
@ -152,6 +151,7 @@ type Control struct {
JoinURL string
IPSECPSK string
DefaultLocalStoragePath string
Skips map[string]bool
SystemDefaultRegistry string
ClusterInit bool
ClusterReset bool