RKE host structure and config changes #56
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
galal-hussein
force-pushed
the
config_changes
branch
from
bc73ca9
to
8f0f9d1
Compare
|
@alena1108 @moelsayed Can you please review? |
galal-hussein
force-pushed
the
config_changes
branch
from
8f0f9d1
to
62b2de1
Compare
galal-hussein
force-pushed
the
config_changes
branch
2 times, most recently
from
363ff98
to
7bf08eb
Compare
alena1108
reviewed
Nov 28, 2017
| @@ -90,7 +90,7 @@ func IsHostListChanged(currentHosts, configHosts []Host) bool { | |||
| for _, host := range currentHosts { | |||
| found := false | |||
| for _, configHost := range configHosts { | |||
| if host.AdvertisedHostname == configHost.AdvertisedHostname { | |||
| if host.Address == configHost.Address { | |||
| found = true | |||
alena1108
reviewed
Nov 28, 2017
cluster/validation.go
Outdated
| if role == services.ControlRole { | ||
| bothRoles[services.ControlRole] = true | ||
| } | ||
| if role == services.WorkerRole { |
alena1108
reviewed
Nov 28, 2017
cluster/validation.go
Outdated
| return fmt.Errorf("Role [%s] for host (%d) is not recognized", role, i+1) | ||
| } | ||
| } | ||
| bothRoles := make(map[string]bool) |
There was a problem hiding this comment.
any reason why we use a map here? there are only 2 values, workerRole and controlRole, may be can use bool instead to simplify the outlook?
alena1108
reviewed
Nov 28, 2017
cluster/validation.go
Outdated
| @@ -13,16 +15,79 @@ func (c *Cluster) ValidateCluster() error { | |||
| if len(c.EtcdHosts) == 0 { | |||
There was a problem hiding this comment.
Should we validate number of etcd hosts (it should be an odd number)?
alena1108
reviewed
Nov 28, 2017
cluster/validation.go
Outdated
| } | ||
|
|
||
| func validateNetworkOptions(c *Cluster) error { | ||
| if c.Network.Plugin != "flannel" && c.Network.Plugin != "calico" && c.Network.Plugin != "canal" { |
There was a problem hiding this comment.
I suggest you define the constants for the network plugins.
galal-hussein
force-pushed
the
config_changes
branch
from
7bf08eb
to
41c4887
Compare
alena1108
reviewed
Nov 28, 2017
| ) | ||
|
|
||
| func (c *Cluster) ValidateCluster() error { | ||
| // make sure cluster has at least one controlplane/etcd host | ||
| if len(c.ControlPlaneHosts) == 0 { | ||
| return fmt.Errorf("Cluster must have at least one control plane host") | ||
| } | ||
| if len(c.EtcdHosts) == 0 { | ||
| return fmt.Errorf("Cluster must have at least one etcd host") | ||
| if len(c.EtcdHosts)%2 == 0 { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#53
#52
#50
#41
#36
IPtoAddressAdvertiseAddresstoInternalAddressAdvertisedHostnametoHostnameOverrideHostname will be optional, and if not set it will be equal to Address.