kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix various tests that used masters without etcd members

This commit is contained in:
Ole Markus With 2020-04-28 14:45:05 +02:00
parent 4978932213
commit 74732487d5
10 changed files with 112 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/apis/kops/validation/instancegroup.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package validation
import (
"fmt"
"strings"
"github.com/aws/aws-sdk-go/aws/arn"
@ -225,7 +226,7 @@ func ValidateMasterInstanceGroup(g *kops.InstanceGroup, cluster *kops.Cluster) f
}
}
if !hasEtcd {
allErrs = append(allErrs, field.NotFound(field.NewPath("spec", "etcdClusters").Key(etcd.Name), g.ObjectMeta.Name))
allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "metadata", "name"), fmt.Sprintf("InstanceGroup \"%s\" with role Master must have a member in etcd cluster \"%s\"", g.ObjectMeta.Name, etcd.Name)))
}
}
return allErrs

4
pkg/apis/kops/validation/instancegroup_test.go
View File

@ -103,7 +103,7 @@ func TestValidMasterInstanceGroup(t *testing.T) {
Cluster: &kops.Cluster{
Spec: kops.ClusterSpec{
EtcdClusters: []*kops.EtcdClusterSpec{
&kops.EtcdClusterSpec{
{
Name: "main",
Members: []*kops.EtcdMemberSpec{
{
@ -138,7 +138,7 @@ func TestValidMasterInstanceGroup(t *testing.T) {
Cluster: &kops.Cluster{
Spec: kops.ClusterSpec{
EtcdClusters: []*kops.EtcdClusterSpec{
&kops.EtcdClusterSpec{
{
Name: "main",
Members: []*kops.EtcdMemberSpec{
{

2
tests/integration/update_cluster/existing_iam/data/aws_launch_configuration_master-us-test-1a.masters.existing-iam.example.com_user_data
View File

@ -153,7 +153,7 @@ etcdClusters:
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
apiServerCount: 1
apiServerCount: 3
authorizationMode: AlwaysAllow
bindAddress: 0.0.0.0
cloudProvider: aws

2
tests/integration/update_cluster/existing_iam/data/aws_launch_configuration_master-us-test-1b.masters.existing-iam.example.com_user_data
View File

@ -153,7 +153,7 @@ etcdClusters:
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
apiServerCount: 1
apiServerCount: 3
authorizationMode: AlwaysAllow
bindAddress: 0.0.0.0
cloudProvider: aws

2
tests/integration/update_cluster/existing_iam/data/aws_launch_configuration_master-us-test-1c.masters.existing-iam.example.com_user_data
View File

@ -153,7 +153,7 @@ etcdClusters:
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
apiServerCount: 1
apiServerCount: 3
authorizationMode: AlwaysAllow
bindAddress: 0.0.0.0
cloudProvider: aws

8
tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml
View File

@ -13,10 +13,18 @@ spec:
- etcdMembers:
- instanceGroup: master-us-test-1a
name: a
- instanceGroup: master-us-test-1b
name: b
- instanceGroup: master-us-test-1c
name: c
name: main
- etcdMembers:
- instanceGroup: master-us-test-1a
name: a
- instanceGroup: master-us-test-1b
name: b
- instanceGroup: master-us-test-1c
name: c
name: events
kubelet:
anonymousAuth: false

60
tests/integration/update_cluster/existing_iam/kubernetes.tf
View File

@ -217,7 +217,7 @@ resource "aws_ebs_volume" "a-etcd-events-existing-iam-example-com" {
tags = {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "a.etcd-events.existing-iam.example.com"
"k8s.io/etcd/events" = "a/a"
"k8s.io/etcd/events" = "a/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
@ -231,7 +231,63 @@ resource "aws_ebs_volume" "a-etcd-main-existing-iam-example-com" {
tags = {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "a.etcd-main.existing-iam.example.com"
"k8s.io/etcd/main" = "a/a"
"k8s.io/etcd/main" = "a/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
type = "gp2"
}
resource "aws_ebs_volume" "b-etcd-events-existing-iam-example-com" {
availability_zone = "us-test-1b"
encrypted = false
size = 20
tags = {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "b.etcd-events.existing-iam.example.com"
"k8s.io/etcd/events" = "b/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
type = "gp2"
}
resource "aws_ebs_volume" "b-etcd-main-existing-iam-example-com" {
availability_zone = "us-test-1b"
encrypted = false
size = 20
tags = {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "b.etcd-main.existing-iam.example.com"
"k8s.io/etcd/main" = "b/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
type = "gp2"
}
resource "aws_ebs_volume" "c-etcd-events-existing-iam-example-com" {
availability_zone = "us-test-1c"
encrypted = false
size = 20
tags = {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "c.etcd-events.existing-iam.example.com"
"k8s.io/etcd/events" = "c/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
type = "gp2"
}
resource "aws_ebs_volume" "c-etcd-main-existing-iam-example-com" {
availability_zone = "us-test-1c"
encrypted = false
size = 20
tags = {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "c.etcd-main.existing-iam.example.com"
"k8s.io/etcd/main" = "c/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}

34
upup/pkg/fi/cloudup/deepvalidate_test.go
View File

@ -118,10 +118,12 @@ func TestDeepValidate_ExtraMasterZone(t *testing.T) {
{Name: "mock1b", Zone: "us-mock-1b", CIDR: "172.20.2.0/24"},
}
var groups []*kopsapi.InstanceGroup
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1a", "subnet-us-mock-1b", "subnet-us-mock-1c"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1a"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1b"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1c"))
groups = append(groups, buildMinimalNodeInstanceGroup("subnet-us-mock-1a", "subnet-us-mock-1b"))
expectErrorFromDeepValidate(t, c, groups, "[spec.subnets[0]: Not found: \"subnet-us-mock-1a\", spec.subnets[1]: Not found: \"subnet-us-mock-1b\", spec.subnets[2]: Not found: \"subnet-us-mock-1c\"]")
expectErrorFromDeepValidate(t, c, groups, "spec.subnets[0]: Not found: \"subnet-us-mock-1a\"")
}
func TestDeepValidate_EvenEtcdClusterSize(t *testing.T) {
@ -137,12 +139,38 @@ func TestDeepValidate_EvenEtcdClusterSize(t *testing.T) {
}
var groups []*kopsapi.InstanceGroup
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1a", "subnet-us-mock-1b", "subnet-us-mock-1c", "subnet-us-mock-1d"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1a"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1b"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1c"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1d"))
groups = append(groups, buildMinimalNodeInstanceGroup("subnet-us-mock-1a"))
expectErrorFromDeepValidate(t, c, groups, "Should be an odd number of master-zones for quorum. Use --zones and --master-zones to declare node zones and master zones separately")
}
func TestDeepValidate_MissingEtcdMember(t *testing.T) {
c := buildDefaultCluster(t)
c.Spec.EtcdClusters = []*kopsapi.EtcdClusterSpec{
{
Name: "main",
Members: []*kopsapi.EtcdMemberSpec{
{Name: "us-mock-1a", InstanceGroup: fi.String("us-mock-1a")},
{Name: "us-mock-1b", InstanceGroup: fi.String("us-mock-1b")},
{Name: "us-mock-1c", InstanceGroup: fi.String("us-mock-1c")},
},
},
}
var groups []*kopsapi.InstanceGroup
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1a"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1b"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1c"))
groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-mock-1d"))
groups = append(groups, buildMinimalNodeInstanceGroup("subnet-us-mock-1a"))
expectErrorFromDeepValidate(t, c, groups, "spec.metadata.name: Forbidden: InstanceGroup \"master-subnet-us-mock-1a\" with role Master must have a member in etcd cluster \"main\"")
}
func expectErrorFromDeepValidate(t *testing.T, c *kopsapi.Cluster, groups []*kopsapi.InstanceGroup, message string) {
err := validation.DeepValidate(c, groups, true)
if err == nil {

6
upup/pkg/fi/cloudup/populateinstancegroup_test.go
View File

@ -33,11 +33,11 @@ func buildMinimalNodeInstanceGroup(subnets ...string) *kopsapi.InstanceGroup {
return g
}
func buildMinimalMasterInstanceGroup(subnets ...string) *kopsapi.InstanceGroup {
func buildMinimalMasterInstanceGroup(subnet string) *kopsapi.InstanceGroup {
g := &kopsapi.InstanceGroup{}
g.ObjectMeta.Name = "master"
g.ObjectMeta.Name = "master-" + subnet
g.Spec.Role = kopsapi.InstanceGroupRoleMaster
g.Spec.Subnets = subnets
g.Spec.Subnets = []string{subnet}
return g
}

14
upup/pkg/fi/cloudup/validation_test.go
View File

@ -21,7 +21,6 @@ import (
"strings"
"testing"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/validation"
@ -39,23 +38,20 @@ func buildDefaultCluster(t *testing.T) *api.Cluster {
}
if len(c.Spec.EtcdClusters) == 0 {
zones := sets.NewString()
for _, z := range c.Spec.Subnets {
zones.Insert(z.Zone)
}
etcdZones := zones.List()
for _, etcdCluster := range EtcdClusters {
etcd := &api.EtcdClusterSpec{}
etcd.Name = etcdCluster
for _, zone := range etcdZones {
for _, subnet := range c.Spec.Subnets {
m := &api.EtcdMemberSpec{}
m.Name = zone
m.InstanceGroup = fi.String(zone)
m.Name = subnet.Zone
m.InstanceGroup = fi.String("master-" + subnet.Name)
etcd.Members = append(etcd.Members, m)
}
c.Spec.EtcdClusters = append(c.Spec.EtcdClusters, etcd)
}
}
fullSpec, err := mockedPopulateClusterSpec(c)