github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22280 from justinsb/fix_error_message_formats

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-21 16:53:38 -07:00
commit 0a28a38110
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/cloudprovider/providers/aws/aws.go
View File

@ -1513,7 +1513,7 @@ func (s *AWSCloud) findSecurityGroup(securityGroupId string) (*ec2.SecurityGroup
groups, err := s.ec2.DescribeSecurityGroups(describeSecurityGroupsRequest) groups, err := s.ec2.DescribeSecurityGroups(describeSecurityGroupsRequest)
if err != nil { if err != nil {
glog.Warning("Error retrieving security group", err) glog.Warningf("Error retrieving security group: %q", err)
return nil, err return nil, err
} }
@ -1522,7 +1522,7 @@ func (s *AWSCloud) findSecurityGroup(securityGroupId string) (*ec2.SecurityGroup
} }
if len(groups) != 1 { if len(groups) != 1 {
// This should not be possible - ids should be unique // This should not be possible - ids should be unique
return nil, fmt.Errorf("multiple security groups found with same id") return nil, fmt.Errorf("multiple security groups found with same id %q", securityGroupId)
} }
group := groups[0] group := groups[0]
return group, nil return group, nil
@ -1680,7 +1680,7 @@ func (s *AWSCloud) setSecurityGroupIngress(securityGroupId string, permissions I
func (s *AWSCloud) addSecurityGroupIngress(securityGroupId string, addPermissions []*ec2.IpPermission) (bool, error) { func (s *AWSCloud) addSecurityGroupIngress(securityGroupId string, addPermissions []*ec2.IpPermission) (bool, error) {
group, err := s.findSecurityGroup(securityGroupId) group, err := s.findSecurityGroup(securityGroupId)
if err != nil { if err != nil {
glog.Warning("Error retrieving security group", err) glog.Warningf("Error retrieving security group: %v", err)
return false, err return false, err
} }
@ -1736,7 +1736,7 @@ func (s *AWSCloud) addSecurityGroupIngress(securityGroupId string, addPermission
func (s *AWSCloud) removeSecurityGroupIngress(securityGroupId string, removePermissions []*ec2.IpPermission) (bool, error) { func (s *AWSCloud) removeSecurityGroupIngress(securityGroupId string, removePermissions []*ec2.IpPermission) (bool, error) {
group, err := s.findSecurityGroup(securityGroupId) group, err := s.findSecurityGroup(securityGroupId)
if err != nil { if err != nil {
glog.Warning("Error retrieving security group", err) glog.Warningf("Error retrieving security group: %v", err)
return false, err return false, err
} }
@ -1778,7 +1778,7 @@ func (s *AWSCloud) removeSecurityGroupIngress(securityGroupId string, removePerm
request.IpPermissions = changes request.IpPermissions = changes
_, err = s.ec2.RevokeSecurityGroupIngress(request) _, err = s.ec2.RevokeSecurityGroupIngress(request)
if err != nil { if err != nil {
glog.Warning("Error revoking security group ingress", err) glog.Warningf("Error revoking security group ingress: %v", err)
return false, err return false, err
} }
@ -1843,7 +1843,7 @@ func (s *AWSCloud) ensureSecurityGroup(name string, description string) (string,
if len(securityGroups) >= 1 { if len(securityGroups) >= 1 {
if len(securityGroups) > 1 { if len(securityGroups) > 1 {
glog.Warning("Found multiple security groups with name:", name) glog.Warningf("Found multiple security groups with name: %q", name)
} }
err := s.ensureClusterTags(aws.StringValue(securityGroups[0].GroupId), securityGroups[0].Tags) err := s.ensureClusterTags(aws.StringValue(securityGroups[0].GroupId), securityGroups[0].Tags)
if err != nil { if err != nil {
@ -2041,7 +2041,7 @@ func (s *AWSCloud) findELBSubnets(internalELB bool) ([]string, error) {
} }
// TODO: Should this be an error? // TODO: Should this be an error?
glog.Warning("Found multiple subnets in AZ %q; making arbitrary choice between subnets %q and %q", az, *existing.SubnetId, *subnet.SubnetId) glog.Warningf("Found multiple subnets in AZ %q; making arbitrary choice between subnets %q and %q", az, *existing.SubnetId, *subnet.SubnetId)
continue continue
} }
@ -2231,7 +2231,7 @@ func (s *AWSCloud) EnsureLoadBalancer(name, region string, publicIP net.IP, port
err = s.updateInstanceSecurityGroupsForLoadBalancer(loadBalancer, instances) err = s.updateInstanceSecurityGroupsForLoadBalancer(loadBalancer, instances)
if err != nil { if err != nil {
glog.Warning("Error opening ingress rules for the load balancer to the instances: ", err) glog.Warningf("Error opening ingress rules for the load balancer to the instances: %v", err)
return nil, err return nil, err
} }
@ -2313,7 +2313,7 @@ func findSecurityGroupForInstance(instance *ec2.Instance, taggedSecurityGroups m
} }
if best == nil { if best == nil {
glog.Warning("No security group found for instance ", instanceID) glog.Warningf("No security group found for instance %q", instanceID)
} }
return best, nil return best, nil
@ -2355,7 +2355,7 @@ func (s *AWSCloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalan
} }
if loadBalancerSecurityGroupId != "" { if loadBalancerSecurityGroupId != "" {
// We create LBs with one SG // We create LBs with one SG
glog.Warning("Multiple security groups for load balancer: ", orEmpty(lb.LoadBalancerName)) glog.Warningf("Multiple security groups for load balancer: %q", orEmpty(lb.LoadBalancerName))
} }
loadBalancerSecurityGroupId = *securityGroup loadBalancerSecurityGroupId = *securityGroup
} }