Merge pull request #1253 from mikeweiwei/my_fix
fix logging calls(azure_container_service_pool.go)
This commit is contained in:
commit
dd92706b69
|
|
@ -122,7 +122,7 @@ func (agentPool *ContainerServiceAgentPool) getAKSNodeCount() (count int, err er
|
||||||
agentPool.resourceGroup,
|
agentPool.resourceGroup,
|
||||||
agentPool.clusterName)
|
agentPool.clusterName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Error("Failed to get AKS cluster (name:%q): %v", agentPool.clusterName, err)
|
glog.Errorf("Failed to get AKS cluster (name:%q): %v", agentPool.clusterName, err)
|
||||||
return -1, err
|
return -1, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -147,7 +147,7 @@ func (agentPool *ContainerServiceAgentPool) getACSNodeCount() (count int, err er
|
||||||
agentPool.resourceGroup,
|
agentPool.resourceGroup,
|
||||||
agentPool.clusterName)
|
agentPool.clusterName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Error("Failed to get ACS cluster (name:%q): %v", agentPool.clusterName, err)
|
glog.Errorf("Failed to get ACS cluster (name:%q): %v", agentPool.clusterName, err)
|
||||||
return -1, err
|
return -1, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -172,7 +172,7 @@ func (agentPool *ContainerServiceAgentPool) setAKSNodeCount(count int) error {
|
||||||
agentPool.resourceGroup,
|
agentPool.resourceGroup,
|
||||||
agentPool.clusterName)
|
agentPool.clusterName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Error("Failed to get AKS cluster (name:%q): %v", agentPool.clusterName, err)
|
glog.Errorf("Failed to get AKS cluster (name:%q): %v", agentPool.clusterName, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -190,7 +190,7 @@ func (agentPool *ContainerServiceAgentPool) setAKSNodeCount(count int) error {
|
||||||
future, err := aksClient.CreateOrUpdate(updateCtx, agentPool.resourceGroup,
|
future, err := aksClient.CreateOrUpdate(updateCtx, agentPool.resourceGroup,
|
||||||
agentPool.clusterName, managedCluster)
|
agentPool.clusterName, managedCluster)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Error("Failed to update AKS cluster (%q): %v", agentPool.clusterName, err)
|
glog.Errorf("Failed to update AKS cluster (%q): %v", agentPool.clusterName, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return future.WaitForCompletion(updateCtx, aksClient.Client)
|
return future.WaitForCompletion(updateCtx, aksClient.Client)
|
||||||
|
|
@ -205,7 +205,7 @@ func (agentPool *ContainerServiceAgentPool) setACSNodeCount(count int) error {
|
||||||
agentPool.resourceGroup,
|
agentPool.resourceGroup,
|
||||||
agentPool.clusterName)
|
agentPool.clusterName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Error("Failed to get ACS cluster (name:%q): %v", agentPool.clusterName, err)
|
glog.Errorf("Failed to get ACS cluster (name:%q): %v", agentPool.clusterName, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -223,7 +223,7 @@ func (agentPool *ContainerServiceAgentPool) setACSNodeCount(count int) error {
|
||||||
future, err := acsClient.CreateOrUpdate(updateCtx, agentPool.resourceGroup,
|
future, err := acsClient.CreateOrUpdate(updateCtx, agentPool.resourceGroup,
|
||||||
agentPool.clusterName, acsCluster)
|
agentPool.clusterName, acsCluster)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Error("Failed to update ACS cluster (%q): %v", agentPool.clusterName, err)
|
glog.Errorf("Failed to update ACS cluster (%q): %v", agentPool.clusterName, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return future.WaitForCompletion(updateCtx, acsClient.Client)
|
return future.WaitForCompletion(updateCtx, acsClient.Client)
|
||||||
|
|
@ -394,7 +394,7 @@ func (agentPool *ContainerServiceAgentPool) GetNodes() ([]string, error) {
|
||||||
defer cancel()
|
defer cancel()
|
||||||
vmList, err := agentPool.manager.azClient.virtualMachinesClient.List(ctx, agentPool.nodeResourceGroup)
|
vmList, err := agentPool.manager.azClient.virtualMachinesClient.List(ctx, agentPool.nodeResourceGroup)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Error("Error", err)
|
glog.Errorf("Azure client list vm error : %v", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
var nodeArray []string
|
var nodeArray []string
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue