Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Capitalize the first letter in some log files #15278

Merged
merged 1 commit into from
Oct 15, 2015
Merged

Capitalize the first letter in some log files #15278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/addons/dns/kube2sky/kube2sky.go
View file
Open in desktop
Expand Up @@ -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)
}
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
}
if e, ok := e.(*kapi.Endpoints); ok {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/registered/registered.go
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ func init() {
valid, ok := validAPIVersions[version]
if !ok || !valid {
// 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)
}
RegisteredVersions = append(RegisteredVersions, version)
Expand Down
27 changes: 14 additions & 13 deletions pkg/cloudprovider/providers/aws/aws.go
View file
Open in desktop
Expand Up @@ -1249,7 +1249,7 @@ func (s *AWSCloud) findSecurityGroup(securityGroupId string) (*ec2.SecurityGroup

groups, err := s.ec2.DescribeSecurityGroups(describeSecurityGroupsRequest)
if err != nil {
glog.Warning("error retrieving security group", err)
glog.Warning("Error retrieving security group", err)
return nil, err
}

Expand Down Expand Up @@ -1325,7 +1325,7 @@ func isEqualIPPermission(l, r *ec2.IpPermission, compareGroupUserIDs bool) bool
func (s *AWSCloud) ensureSecurityGroupIngress(securityGroupId string, addPermissions []*ec2.IpPermission) (bool, error) {
group, err := s.findSecurityGroup(securityGroupId)
if err != nil {
glog.Warning("error retrieving security group", err)
glog.Warning("Error retrieving security group", err)
return false, err
}

Expand Down Expand Up @@ -1366,7 +1366,7 @@ func (s *AWSCloud) ensureSecurityGroupIngress(securityGroupId string, addPermiss
request.IpPermissions = changes
_, err = s.ec2.AuthorizeSecurityGroupIngress(request)
if err != nil {
glog.Warning("error authorizing security group ingress", err)
glog.Warning("Error authorizing security group ingress", err)
return false, err
}

Expand All @@ -1379,12 +1379,12 @@ func (s *AWSCloud) ensureSecurityGroupIngress(securityGroupId string, addPermiss
func (s *AWSCloud) removeSecurityGroupIngress(securityGroupId string, removePermissions []*ec2.IpPermission) (bool, error) {
group, err := s.findSecurityGroup(securityGroupId)
if err != nil {
glog.Warning("error retrieving security group", err)
glog.Warning("Error retrieving security group", err)
return false, err
}

if group == nil {
glog.Warning("security group not found: ", securityGroupId)
glog.Warning("Security group not found: ", securityGroupId)
return false, nil
}

Expand Down Expand Up @@ -1421,7 +1421,7 @@ func (s *AWSCloud) removeSecurityGroupIngress(securityGroupId string, removePerm
request.IpPermissions = changes
_, err = s.ec2.RevokeSecurityGroupIngress(request)
if err != nil {
glog.Warning("error revoking security group ingress", err)
glog.Warning("Error revoking security group ingress", err)
return false, err
}

Expand Down Expand Up @@ -1543,7 +1543,7 @@ func (s *AWSCloud) listSubnetIDsinVPC(vpcId string) ([]string, error) {

subnets, err := s.ec2.DescribeSubnets(request)
if err != nil {
glog.Error("error describing subnets: ", err)
glog.Error("Error describing subnets: ", err)
return nil, err
}

Expand Down Expand Up @@ -1587,13 +1587,14 @@ func (s *AWSCloud) EnsureTCPLoadBalancer(name, region string, publicIP net.IP, p

vpcId, err := s.findVPCID()
if err != nil {
glog.Error("Error finding VPC", err)
return nil, err
}

// Construct list of configured subnets
subnetIDs, err := s.listSubnetIDsinVPC(vpcId)
if err != nil {
glog.Error("error listing subnets in VPC", err)
glog.Error("Error listing subnets in VPC", err)
return nil, err
}

Expand Down Expand Up @@ -1828,15 +1829,15 @@ func (s *AWSCloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalan
return err
}
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 {
changed, err := s.removeSecurityGroupIngress(instanceSecurityGroupId, permissions)
if err != nil {
return err
}
if !changed {
glog.Warning("revoking ingress was not needed; concurrent change? groupId=", instanceSecurityGroupId)
glog.Warning("Revoking ingress was not needed; concurrent change? groupId=", instanceSecurityGroupId)
}
}
}
Expand Down Expand Up @@ -1910,7 +1911,7 @@ func (s *AWSCloud) EnsureTCPLoadBalancerDeleted(name, region string) error {
ignore := false
if awsError, ok := err.(awserr.Error); ok {
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
}
}
Expand All @@ -1921,15 +1922,15 @@ func (s *AWSCloud) EnsureTCPLoadBalancerDeleted(name, region string) error {
}

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
}

if time.Now().After(timeoutAt) {
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)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudprovider/providers/openstack/openstack.go
View file
Open in desktop
Expand Up @@ -906,15 +906,15 @@ func (os *OpenStack) getComputeIDbyHostname(cClient *gophercloud.ServiceClient)
glog.Errorf("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 {
server, err := getServerByName(cClient, srvname)
if err != nil {
return "", err
} else {
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
}
}
Expand Down