From 3f66e092e560294a2d198a1ddfdbd2a8b0d43cfd Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Mon, 30 Mar 2020 23:24:57 -0700 Subject: [PATCH] Fix field names for etcd members --- pkg/apis/kops/validation/validation.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 13d1172291..cb9cf371b6 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -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