Skip to content

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

Merge pull request #4770 from manuelbuil/bug-ha

[Release 1-20] Fix joining ha problems
parents c4f8f3e2 329ffcf8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
pkg/cluster/bootstrap.go
View file @ 7fc43002
...@@ -179,8 +179,9 @@ func (c *Cluster) compareConfig() error { ...@@ -179,8 +179,9 @@ func (c *Cluster) compareConfig() error {
} }
// We are saving IPs of ClusterIPRanges and ServiceIPRanges in 4-bytes representation but json decodes in 16-byte // We are saving IPs of ClusterIPRanges and ServiceIPRanges in 4-bytes representation but json decodes in 16-byte
c.config.CriticalControlArgs.ClusterIPRange.IP.To16() c.config.CriticalControlArgs.ClusterIPRange.IP = c.config.CriticalControlArgs.ClusterIPRange.IP.To16()
c.config.CriticalControlArgs.ServiceIPRange.IP.To16() c.config.CriticalControlArgs.ServiceIPRange.IP = c.config.CriticalControlArgs.ServiceIPRange.IP.To16()
c.config.CriticalControlArgs.ClusterDNS = c.config.CriticalControlArgs.ClusterDNS.To16()
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)
......
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