Skip to content

K
k3s
Commit 96162c07 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Handle egress-selector-mode change during upgrade

Properly handle unset egress-selector-mode from existing servers during cluster upgrade. Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 9345bd05
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
pkg/cluster/bootstrap.go
View file @ 96162c07
...@@ -536,6 +536,12 @@ func (c *Cluster) compareConfig() error { ...@@ -536,6 +536,12 @@ func (c *Cluster) compareConfig() error {
ipsTo16Bytes(c.config.CriticalControlArgs.ClusterIPRanges) ipsTo16Bytes(c.config.CriticalControlArgs.ClusterIPRanges)
ipsTo16Bytes(c.config.CriticalControlArgs.ServiceIPRanges) ipsTo16Bytes(c.config.CriticalControlArgs.ServiceIPRanges)
// If the remote server is down-level and did not fill the egress-selector
// mode, use the local value to allow for temporary mismatch during upgrades.
if clusterControl.CriticalControlArgs.EgressSelectorMode == "" {
clusterControl.CriticalControlArgs.EgressSelectorMode = c.config.CriticalControlArgs.EgressSelectorMode
}
if !reflect.DeepEqual(clusterControl.CriticalControlArgs, c.config.CriticalControlArgs) { if !reflect.DeepEqual(clusterControl.CriticalControlArgs, c.config.CriticalControlArgs) {
logrus.Debugf("This is the server CriticalControlArgs: %#v", clusterControl.CriticalControlArgs) logrus.Debugf("This is the server CriticalControlArgs: %#v", clusterControl.CriticalControlArgs)
logrus.Debugf("This is the local CriticalControlArgs: %#v", c.config.CriticalControlArgs) logrus.Debugf("This is the local CriticalControlArgs: %#v", c.config.CriticalControlArgs)
......
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