mirror of https://github.com/kubernetes/kops.git
Merge pull request #7586 from alrs/fix-upup-errors
Fix Dropped Errors in upup
This commit is contained in:
commit
f2ecbd5eb6
|
@ -74,6 +74,9 @@ func TestSharedInternetGatewayDoesNotRename(t *testing.T) {
|
|||
InternetGatewayId: internetGateway.InternetGateway.InternetGatewayId,
|
||||
VpcId: vpc.Vpc.VpcId,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("error attaching igw: %v", err)
|
||||
}
|
||||
|
||||
// We define a function so we can rebuild the tasks, because we modify in-place when running
|
||||
buildTasks := func() map[string]fi.Task {
|
||||
|
|
|
@ -59,7 +59,9 @@ func NewSubnetTaskFromCloud(cloud openstack.OpenstackCloud, lifecycle *fi.Lifecy
|
|||
return nil, fmt.Errorf("NewSubnetTaskFromCloud: Failed to get network with ID %s: %v", subnet.NetworkID, err)
|
||||
}
|
||||
networkTask, err := NewNetworkTaskFromCloud(cloud, lifecycle, network)
|
||||
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error creating network task from cloud: %v", err)
|
||||
}
|
||||
nameservers := make([]*string, len(subnet.DNSNameservers))
|
||||
for i, ns := range subnet.DNSNameservers {
|
||||
nameservers[i] = fi.String(ns)
|
||||
|
|
|
@ -468,6 +468,9 @@ func evaluateHostnameOverride(hostnameOverride string) (string, error) {
|
|||
result, err := svc.DescribeInstances(&ec2.DescribeInstancesInput{
|
||||
InstanceIds: []*string{&instanceID},
|
||||
})
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("error describing instances: %v", err)
|
||||
}
|
||||
|
||||
if len(result.Reservations) != 1 {
|
||||
return "", fmt.Errorf("Too many reservations returned for the single instance-id")
|
||||
|
|
Loading…
Reference in New Issue