Manual cherry pick of #10361: Prefix etcd cluster names with letters

cmd/kops/create_cluster.go

@@ -1408,6 +1408,13 @@ func trimCommonPrefix(names []string) []string {
 		}
 	}
 
+	for i := range names {
+		_, err := strconv.Atoi(names[i])
+		if err == nil {
+			names[i] = "etcd-" + names[i]
+		}
+	}
+
 	return names
 }
 

cmd/kops/createcluster_test.go

@@ -42,6 +42,10 @@ func TestRemoveSharedPrefix(t *testing.T) {
 			Input:  []string{"zza", "zzb", ""},
 			Output: []string{"zza", "zzb", ""},
 		},
+		{
+			Input:  []string{"us-test-1a-1", "us-test-1a-2", "us-test-1a-3"},
+			Output: []string{"etcd-1", "etcd-2", "etcd-3"},
+		},
 		{
 			Input:  []string{"us-test-1a-1", "us-test-1b-1", "us-test-1a-2", "us-test-1b-2", "us-test-1a-3"},
 			Output: []string{"a-1", "b-1", "a-2", "b-2", "a-3"},

go.sum

@@ -1064,6 +1064,7 @@ k8s.io/cloud-provider v0.18.6/go.mod h1:QnPLLdFkvtx1dEyVMaPUdzVWB+ECzEf+PA3DXwIr
 k8s.io/cloud-provider-openstack v1.17.0 h1:n6hkiJSekJEa2LIlu+1uGfMt5jwIvPO2qnx5tcJtlYo=
 k8s.io/cloud-provider-openstack v1.17.0/go.mod h1:0pc0EbtR72bEHmhjKwzrY60oeiQzlCONjZeDe8DEgN8=
 k8s.io/cluster-bootstrap v0.18.6/go.mod h1:lnM1CXtPImlEBTh5874ZI+ofZzdIy1t2JV9Y+NxvojU=
+k8s.io/code-generator v0.18.6 h1:QdfvGfs4gUCS1dru+rLbCKIFxYEV0IRfF8MXwY/ozLk=
 k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
 k8s.io/component-base v0.18.6 h1:Wd6cHGwJN2qpufnirVOB3oMhyhbioGsKEi5HeDBsV+s=
 k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14=