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

Merge pull request #11043 from bharath-123/nit/fix-error-msg 

Improve instance type validation error message
This commit is contained in:
Kubernetes Prow Robot 2021-03-13 10:11:04 -08:00 committed by GitHub
parent 1f82aa2571 059c7ef33a
commit 46d92da26b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/kops/validation/aws.go
View File

@ -153,7 +153,7 @@ func awsValidateInstanceTypeAndImage(instanceTypeFieldPath *field.Path, imageFie
}
if !found {
allErrs = append(allErrs, field.Invalid(instanceTypeFieldPath, instanceType,
fmt.Sprintf("machine type architecture does not match image architecture: %+v - %q", machineInfo.ProcessorInfo, imageArch)))
fmt.Sprintf("machine type architecture does not match image architecture: %s - %s", strings.Join(fi.StringSliceValue(machineInfo.ProcessorInfo.SupportedArchitectures), ","), imageArch)))
}
}

14
pkg/apis/kops/validation/aws_test.go
View File

@ -301,6 +301,18 @@ func TestMixedInstancePolicies(t *testing.T) {
func TestInstanceMetadataOptions(t *testing.T) {
cloud := awsup.BuildMockAWSCloud("us-east-1", "abc")
mockEC2 := &mockec2.MockEC2{}
cloud.MockEC2 = mockEC2
mockEC2.Images = append(mockEC2.Images, &ec2.Image{
CreationDate: aws.String("2016-10-21T20:07:19.000Z"),
ImageId: aws.String("ami-073c8c0760395aab8"),
Name: aws.String("focal"),
OwnerId: aws.String(awsup.WellKnownAccountUbuntu),
RootDeviceName: aws.String("/dev/xvda"),
Architecture: aws.String("x86_64"),
})
tests := []struct {
ig *kops.InstanceGroup
expected []string
@ -316,6 +328,7 @@ func TestInstanceMetadataOptions(t *testing.T) {
HTTPPutResponseHopLimit: fi.Int64(1),
HTTPTokens: fi.String("abc"),
},
MachineType: "t3.medium",
},
},
expected: []string{"Unsupported value::spec.instanceMetadata.httpTokens"},
@ -331,6 +344,7 @@ func TestInstanceMetadataOptions(t *testing.T) {
HTTPPutResponseHopLimit: fi.Int64(-1),
HTTPTokens: fi.String("required"),
},
MachineType: "t3.medium",
},
},
expected: []string{"Invalid value::spec.instanceMetadata.httpPutResponseHopLimit"},

2
upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go
View File

@ -308,7 +308,7 @@ func (c *MockAWSCloud) DescribeInstanceType(instanceType string) (*ec2.InstanceT
}
switch instanceType {
case "c5.large", "m3.medium", "m4.large", "m5.large", "m5.xlarge", "t2.micro", "t2.medium", "t3.medium", "t3.large":
case "c5.large", "m3.medium", "m4.large", "m5.large", "m5.xlarge", "t2.micro", "t2.medium", "t3.medium", "t3.large", "c4.large":
info.ProcessorInfo = &ec2.ProcessorInfo{
SupportedArchitectures: []*string{
aws.String("x86_64"),