Skip to content

Commit

Permalink
Merge pull request #235 from deads2k/only-ip-ever
Browse files Browse the repository at this point in the history
remove all non-IPs from peer URL
  • Loading branch information
openshift-merge-robot committed Mar 6, 2020
2 parents 80e5b29 + de8e9e6 commit b00e30a
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions pkg/operator/etcdmemberipmigrator/etcdmemberipmigrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,7 @@ func getRequiredPeerList(etcdInfos []etcdInfo, existingPeerURLs []string) ([]str
return nil, fmt.Errorf("unable to locate a node for peerURL=%v, dnsErrors=%v", strings.Join(existingPeerURLs, ","), utilerrors.NewAggregate(dnsErrors))
}

// append instead of prepend so the discover-initial-etcd-cluster command still matches the pod.
requiredPeerList := append([]string{}, existingPeerURLs...)
requiredPeerList = append(requiredPeerList, fmt.Sprintf("https://%s:2380", needle.preferredNodeIPForURL))
return requiredPeerList, nil
return []string{fmt.Sprintf("https://%s:2380", needle.preferredNodeIPForURL)}, nil
}

type etcdInfo struct {
Expand Down

0 comments on commit b00e30a

Please sign in to comment.