Skip to content

Commit

Permalink
Make functions private
Browse files Browse the repository at this point in the history
  • Loading branch information
johngmyers committed Jan 1, 2020
1 parent cd499f6 commit 8cde491
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pkg/instancegroups/instancegroups.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (r *RollingUpdateInstanceGroup) RollingUpdate(rollingUpdateData *RollingUpd
if u.Node != nil {
klog.Infof("Draining the node: %q.", nodeName)

if err = r.DrainNode(u, rollingUpdateData); err != nil {
if err = r.drainNode(u, rollingUpdateData); err != nil {
if rollingUpdateData.FailOnDrainError {
return fmt.Errorf("failed to drain node %q: %v", nodeName, err)
}
Expand All @@ -180,7 +180,7 @@ func (r *RollingUpdateInstanceGroup) RollingUpdate(rollingUpdateData *RollingUpd
}
}

if err = r.DeleteInstance(u); err != nil {
if err = r.deleteInstance(u); err != nil {
klog.Errorf("error deleting instance %q, node %q: %v", instanceId, nodeName, err)
return err
}
Expand Down Expand Up @@ -292,8 +292,8 @@ func (r *RollingUpdateInstanceGroup) validateCluster(rollingUpdateData *RollingU

}

// DeleteInstance deletes an Cloud Instance.
func (r *RollingUpdateInstanceGroup) DeleteInstance(u *cloudinstances.CloudInstanceGroupMember) error {
// deleteInstance deletes an Cloud Instance.
func (r *RollingUpdateInstanceGroup) deleteInstance(u *cloudinstances.CloudInstanceGroupMember) error {
id := u.ID
nodeName := ""
if u.Node != nil {
Expand All @@ -317,8 +317,8 @@ func (r *RollingUpdateInstanceGroup) DeleteInstance(u *cloudinstances.CloudInsta

}

// DrainNode drains a K8s node.
func (r *RollingUpdateInstanceGroup) DrainNode(u *cloudinstances.CloudInstanceGroupMember, rollingUpdateData *RollingUpdateCluster) error {
// drainNode drains a K8s node.
func (r *RollingUpdateInstanceGroup) drainNode(u *cloudinstances.CloudInstanceGroupMember, rollingUpdateData *RollingUpdateCluster) error {
if rollingUpdateData.K8sClient == nil {
return fmt.Errorf("K8sClient not set")
}
Expand Down Expand Up @@ -362,7 +362,7 @@ func (r *RollingUpdateInstanceGroup) DrainNode(u *cloudinstances.CloudInstanceGr
return nil
}

// DeleteNode deletes a node from the k8s API. It does not delete the underlying instance.
// deleteNode deletes a node from the k8s API. It does not delete the underlying instance.
func (r *RollingUpdateInstanceGroup) deleteNode(node *corev1.Node, rollingUpdateData *RollingUpdateCluster) error {
k8sclient := rollingUpdateData.K8sClient
var options metav1.DeleteOptions
Expand Down

0 comments on commit 8cde491

Please sign in to comment.