mirror of https://github.com/kubernetes/kops.git
Fix field names for etcd members
This commit is contained in:
parent
7e934440e5
commit
3f66e092e5
|
|
@ -562,14 +562,14 @@ func validateEtcdClusterSpec(spec *kops.EtcdClusterSpec, c *kops.Cluster, fieldP
|
|||
}
|
||||
}
|
||||
if len(spec.Members) == 0 {
|
||||
allErrs = append(allErrs, field.Required(fieldPath.Child("members"), "No members defined in etcd cluster"))
|
||||
allErrs = append(allErrs, field.Required(fieldPath.Child("etcdMembers"), "No members defined in etcd cluster"))
|
||||
} else if (len(spec.Members) % 2) == 0 {
|
||||
// Not technically a requirement, but doesn't really make sense to allow
|
||||
allErrs = append(allErrs, field.Invalid(fieldPath.Child("members"), len(spec.Members), "Should be an odd number of master-zones for quorum. Use --zones and --master-zones to declare node zones and master zones separately"))
|
||||
allErrs = append(allErrs, field.Invalid(fieldPath.Child("etcdMembers"), len(spec.Members), "Should be an odd number of master-zones for quorum. Use --zones and --master-zones to declare node zones and master zones separately"))
|
||||
}
|
||||
allErrs = append(allErrs, validateEtcdVersion(spec, fieldPath, nil)...)
|
||||
for _, m := range spec.Members {
|
||||
allErrs = append(allErrs, validateEtcdMemberSpec(m, fieldPath)...)
|
||||
for i, m := range spec.Members {
|
||||
allErrs = append(allErrs, validateEtcdMemberSpec(m, fieldPath.Child("etcdMembers").Index(i))...)
|
||||
}
|
||||
|
||||
return allErrs
|
||||
|
|
|
|||
Loading…
Reference in New Issue