Skip to content

K
k3s
Unverified Commit 6149cba2 authored by Manuel Buil's avatar Manuel Buil Committed by GitHub
Browse files
Options

Merge pull request #4776 from manuelbuil/fix-rke2-ha-120

[Release 1.20] Remove Disables, Skips and DisableKubeProxy from the comparing configs
parents 7fc43002 97033103
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
pkg/daemons/config/types.go
View file @ 6149cba2
......@@ -95,17 +95,14 @@ type Agent struct {
// CriticalControlArgs contains parameters that all control plane nodes in HA must share
type CriticalControlArgs struct {
ClusterDNS net.IP
ClusterDomain string
ClusterIPRange *net.IPNet
DisableCCM bool
DisableKubeProxy bool
DisableNPC bool
Disables map[string]bool
FlannelBackend string
NoCoreDNS bool
ServiceIPRange *net.IPNet
Skips map[string]bool
ClusterDNS net.IP
ClusterDomain string
ClusterIPRange *net.IPNet
DisableCCM bool
DisableNPC bool
FlannelBackend string
NoCoreDNS bool
ServiceIPRange *net.IPNet
}
type Control struct {
......@@ -129,7 +126,9 @@ type Control struct {
DisableAPIServer bool
DisableControllerManager bool
DisableETCD bool
DisableKubeProxy bool
DisableScheduler bool
Disables map[string]bool
ExtraAPIArgs []string
ExtraControllerArgs []string
ExtraCloudControllerArgs []string
......@@ -138,6 +137,7 @@ type Control struct {
JoinURL string
IPSECPSK string
DefaultLocalStoragePath string
Skips map[string]bool
ClusterInit bool
ClusterReset bool
ClusterResetRestorePath string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment