Skip to content
This repository has been archived by the owner on Mar 31, 2023. It is now read-only.

Commit

Permalink
Use stack allocation where possible
Browse files Browse the repository at this point in the history
Signed-off-by: Dennis Marttinen <dennis@weave.works>
  • Loading branch information
twelho committed Aug 10, 2020
1 parent a78800c commit e5ab4f8
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pkg/apis/wksprovider/controller/wksctl/machine_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -648,12 +648,12 @@ func (a *MachineController) getProviderConfigMaps(ctx context.Context, provider
for _, fileSpec := range fileSpecs {
mapName := fileSpec.Source.ConfigMap
if _, seen := configMaps[mapName]; !seen {
configMap := &corev1.ConfigMap{}
err := a.client.Get(ctx, client.ObjectKey{Namespace: a.controllerNamespace, Name: mapName}, configMap)
var configMap corev1.ConfigMap
err := a.client.Get(ctx, client.ObjectKey{Namespace: a.controllerNamespace, Name: mapName}, &configMap)
if err != nil {
return nil, err
}
configMaps[mapName] = configMap
configMaps[mapName] = &configMap
}
}
return configMaps, nil
Expand Down Expand Up @@ -822,14 +822,14 @@ func (a *MachineController) removeNodeLabel(ctx context.Context, node *corev1.No
func (a *MachineController) modifyNode(ctx context.Context, node *corev1.Node, updater func(node *corev1.Node)) error {
contextLog := log.WithFields(log.Fields{"node": node.Name})
retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
result := &corev1.Node{}
getErr := a.client.Get(ctx, client.ObjectKey{Name: node.Name}, result)
var result corev1.Node
getErr := a.client.Get(ctx, client.ObjectKey{Name: node.Name}, &result)
if getErr != nil {
contextLog.Errorf("failed to read node info, assuming unsafe to update: %v", getErr)
return getErr
}
updater(result)
updateErr := a.client.Update(ctx, result)
updater(&result)
updateErr := a.client.Update(ctx, &result)
if updateErr != nil {
contextLog.Errorf("failed attempt to update node annotation: %v", updateErr)
return updateErr
Expand Down

0 comments on commit e5ab4f8

Please sign in to comment.