github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15278 from combk8s/logCapital

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-15 13:37:39 -07:00
commit ae0ea6496e
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/dns/kube2sky/kube2sky.go
View File

@ -130,7 +130,7 @@ func (ks *kube2sky) newHeadlessService(subdomain string, service *kapi.Service)
return fmt.Errorf("failed to get endpoints object from endpoints store - %v", err) return fmt.Errorf("failed to get endpoints object from endpoints store - %v", err)
} }
if !exists { if !exists {
glog.V(1).Infof("could not find endpoints for service %q in namespace %q. DNS records will be created once endpoints show up.", service.Name, service.Namespace) glog.V(1).Infof("Could not find endpoints for service %q in namespace %q. DNS records will be created once endpoints show up.", service.Name, service.Namespace)
return nil return nil
} }
if e, ok := e.(*kapi.Endpoints); ok { if e, ok := e.(*kapi.Endpoints); ok {

2
pkg/api/registered/registered.go
View File

@ -50,7 +50,7 @@ func init() {
valid, ok := validAPIVersions[version] valid, ok := validAPIVersions[version]
if !ok || !valid { if !ok || !valid {
// Not a valid API version. // Not a valid API version.
glog.Fatalf("invalid api version: %s in KUBE_API_VERSIONS: %s. List of valid API versions: %v", glog.Fatalf("Invalid api version: %s in KUBE_API_VERSIONS: %s. List of valid API versions: %v",
version, os.Getenv("KUBE_API_VERSIONS"), validAPIVersions) version, os.Getenv("KUBE_API_VERSIONS"), validAPIVersions)
} }
RegisteredVersions = append(RegisteredVersions, version) RegisteredVersions = append(RegisteredVersions, version)

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

@ -1249,7 +1249,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.Warning("Error retrieving security group", err)
return nil, err return nil, err
} }
@ -1325,7 +1325,7 @@ func isEqualIPPermission(l, r *ec2.IpPermission, compareGroupUserIDs bool) bool
func (s *AWSCloud) ensureSecurityGroupIngress(securityGroupId string, addPermissions []*ec2.IpPermission) (bool, error) { func (s *AWSCloud) ensureSecurityGroupIngress(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.Warning("Error retrieving security group", err)
return false, err return false, err
} }
@ -1366,7 +1366,7 @@ func (s *AWSCloud) ensureSecurityGroupIngress(securityGroupId string, addPermiss
request.IpPermissions = changes request.IpPermissions = changes
_, err = s.ec2.AuthorizeSecurityGroupIngress(request) _, err = s.ec2.AuthorizeSecurityGroupIngress(request)
if err != nil { if err != nil {
glog.Warning("error authorizing security group ingress", err) glog.Warning("Error authorizing security group ingress", err)
return false, err return false, err
} }
@ -1379,12 +1379,12 @@ func (s *AWSCloud) ensureSecurityGroupIngress(securityGroupId string, addPermiss
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.Warning("Error retrieving security group", err)
return false, err return false, err
} }
if group == nil { if group == nil {
glog.Warning("security group not found: ", securityGroupId) glog.Warning("Security group not found: ", securityGroupId)
return false, nil return false, nil
} }
@ -1421,7 +1421,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.Warning("Error revoking security group ingress", err)
return false, err return false, err
} }
@ -1543,7 +1543,7 @@ func (s *AWSCloud) listSubnetIDsinVPC(vpcId string) ([]string, error) {
subnets, err := s.ec2.DescribeSubnets(request) subnets, err := s.ec2.DescribeSubnets(request)
if err != nil { if err != nil {
glog.Error("error describing subnets: ", err) glog.Error("Error describing subnets: ", err)
return nil, err return nil, err
} }
@ -1587,13 +1587,14 @@ func (s *AWSCloud) EnsureTCPLoadBalancer(name, region string, publicIP net.IP, p
vpcId, err := s.findVPCID() vpcId, err := s.findVPCID()
if err != nil { if err != nil {
glog.Error("Error finding VPC", err)
return nil, err return nil, err
} }
// Construct list of configured subnets // Construct list of configured subnets
subnetIDs, err := s.listSubnetIDsinVPC(vpcId) subnetIDs, err := s.listSubnetIDsinVPC(vpcId)
if err != nil { if err != nil {
glog.Error("error listing subnets in VPC", err) glog.Error("Error listing subnets in VPC", err)
return nil, err return nil, err
} }
@ -1828,7 +1829,7 @@ func (s *AWSCloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalan
return err return err
} }
if !changed { if !changed {
glog.Warning("allowing ingress was not needed; concurrent change? groupId=", instanceSecurityGroupId) glog.Warning("Allowing ingress was not needed; concurrent change? groupId=", instanceSecurityGroupId)
} }
} else { } else {
changed, err := s.removeSecurityGroupIngress(instanceSecurityGroupId, permissions) changed, err := s.removeSecurityGroupIngress(instanceSecurityGroupId, permissions)
@ -1836,7 +1837,7 @@ func (s *AWSCloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalan
return err return err
} }
if !changed { if !changed {
glog.Warning("revoking ingress was not needed; concurrent change? groupId=", instanceSecurityGroupId) glog.Warning("Revoking ingress was not needed; concurrent change? groupId=", instanceSecurityGroupId)
} }
} }
} }
@ -1910,7 +1911,7 @@ func (s *AWSCloud) EnsureTCPLoadBalancerDeleted(name, region string) error {
ignore := false ignore := false
if awsError, ok := err.(awserr.Error); ok { if awsError, ok := err.(awserr.Error); ok {
if awsError.Code() == "DependencyViolation" { if awsError.Code() == "DependencyViolation" {
glog.V(2).Infof("ignoring DependencyViolation while deleting load-balancer security group (%s), assuming because LB is in process of deleting", securityGroupID) glog.V(2).Infof("Ignoring DependencyViolation while deleting load-balancer security group (%s), assuming because LB is in process of deleting", securityGroupID)
ignore = true ignore = true
} }
} }
@ -1921,7 +1922,7 @@ func (s *AWSCloud) EnsureTCPLoadBalancerDeleted(name, region string) error {
} }
if len(securityGroupIDs) == 0 { if len(securityGroupIDs) == 0 {
glog.V(2).Info("deleted all security groups for load balancer: ", name) glog.V(2).Info("Deleted all security groups for load balancer: ", name)
break break
} }
@ -1929,7 +1930,7 @@ func (s *AWSCloud) EnsureTCPLoadBalancerDeleted(name, region string) error {
return fmt.Errorf("timed out waiting for load-balancer deletion: %s", name) return fmt.Errorf("timed out waiting for load-balancer deletion: %s", name)
} }
glog.V(2).Info("waiting for load-balancer to delete so we can delete security groups: ", name) glog.V(2).Info("Waiting for load-balancer to delete so we can delete security groups: ", name)
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
} }

4
pkg/cloudprovider/providers/openstack/openstack.go
View File

@ -906,7 +906,7 @@ func (os *OpenStack) getComputeIDbyHostname(cClient *gophercloud.ServiceClient)
glog.Errorf("Found no servers in the region") glog.Errorf("Found no servers in the region")
return "", errors.New("Found no servers in the region") return "", errors.New("Found no servers in the region")
} }
glog.V(4).Infof("found servers: %v", srvs) glog.V(4).Infof("Found servers: %v", srvs)
for _, srvname := range srvs { for _, srvname := range srvs {
server, err := getServerByName(cClient, srvname) server, err := getServerByName(cClient, srvname)
@ -914,7 +914,7 @@ func (os *OpenStack) getComputeIDbyHostname(cClient *gophercloud.ServiceClient)
return "", err return "", err
} else { } else {
if (server.Metadata["hostname"] != nil && server.Metadata["hostname"] == hostname) || (len(server.Name) > 0 && server.Name == hostname) { if (server.Metadata["hostname"] != nil && server.Metadata["hostname"] == hostname) || (len(server.Name) > 0 && server.Name == hostname) {
glog.V(4).Infof("found server: %s with host :%s", server.Name, hostname) glog.V(4).Infof("Found server: %s with host :%s", server.Name, hostname)
return server.ID, nil return server.ID, nil
} }
} }