Skip to content

Commit

Permalink
Merge pull request #4770 from manuelbuil/bug-ha
Browse files Browse the repository at this point in the history
[Release 1-20] Fix joining ha problems
  • Loading branch information
manuelbuil authored Dec 17, 2021
2 parents c4f8f3e + 329ffcf commit 7fc4300
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkg/cluster/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
c.config.CriticalControlArgs.ClusterIPRange.IP.To16()
c.config.CriticalControlArgs.ServiceIPRange.IP.To16()
c.config.CriticalControlArgs.ClusterIPRange.IP = c.config.CriticalControlArgs.ClusterIPRange.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) {
logrus.Debugf("This is the server CriticalControlArgs: %#v", clusterControl.CriticalControlArgs)
Expand Down

0 comments on commit 7fc4300

Please sign in to comment.