Skip to content

bug 1746019: Add event recording for machines #63

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 10, 2019
Merged

bug 1746019: Add event recording for machines #63

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion config/rbac/rbac_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ rules:
- ""
resources:
- nodes
- events
verbs:
- get
- list
Expand All @@ -53,3 +52,12 @@ rules:
- get
- list
- watch
- apiGroups:
Copy link
Copy Markdown

@Fedosin Fedosin Sep 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we really use this file during the deployment?

Copy link
Copy Markdown
Author

@iamemilio iamemilio Sep 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I was surprised too

Copy link
Copy Markdown

@Fedosin Fedosin Sep 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean that last time I checked there was no cluster role "openstack-provider-manager-role", I need to take a look again

Copy link
Copy Markdown
Author

@iamemilio iamemilio Sep 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all I know is that it failed until I added this ¯\(ツ)/¯

Copy link
Copy Markdown
Author

@iamemilio iamemilio Sep 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/openshift/machine-api-operator/blob/master/install/0000_30_machine-api-operator_09_rbac.yaml

- ""
resources:
- events
verbs:
- create
- watch
- list
- patch
73 changes: 44 additions & 29 deletions pkg/cloud/openstack/machine/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"time"

"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/client-go/tools/record"

clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
Expand Down Expand Up @@ -66,11 +67,20 @@ const (
ErrorState = "ERROR"
)

// Event Action Constants
const (
createEventAction = "Create"
updateEventAction = "Update"
deleteEventAction = "Delete"
noEventAction = ""
)

type OpenstackClient struct {
params openstack.ActuatorParams
scheme *runtime.Scheme
client client.Client
*openstack.DeploymentClient
eventRecorder record.EventRecorder
}

func NewActuator(params openstack.ActuatorParams) (*OpenstackClient, error) {
Expand All @@ -79,6 +89,7 @@ func NewActuator(params openstack.ActuatorParams) (*OpenstackClient, error) {
client: params.Client,
scheme: params.Scheme,
DeploymentClient: openstack.NewDeploymentClient(),
eventRecorder: params.EventRecorder,
}, nil
}

Expand All @@ -103,11 +114,11 @@ func (oc *OpenstackClient) Create(ctx context.Context, cluster *clusterv1.Cluste
providerSpec, err := openstackconfigv1.MachineSpecFromProviderSpec(machine.Spec.ProviderSpec)
if err != nil {
return oc.handleMachineError(machine, apierrors.InvalidMachineConfiguration(
"Cannot unmarshal providerSpec field: %v", err))
"Cannot unmarshal providerSpec field: %v", err), createEventAction)
}

if verr := oc.validateMachine(machine, providerSpec); verr != nil {
return oc.handleMachineError(machine, verr)
return oc.handleMachineError(machine, verr, createEventAction)
}

instance, err := oc.instanceExists(machine)
Expand Down Expand Up @@ -180,19 +191,19 @@ func (oc *OpenstackClient) Create(ctx context.Context, cluster *clusterv1.Cluste
userDataRendered, err = masterStartupScript(cluster, machine, string(userData))
if err != nil {
return oc.handleMachineError(machine, apierrors.CreateMachine(
"error creating Openstack instance: %v", err))
"error creating Openstack instance: %v", err), createEventAction)
}
} else {
klog.Info("Creating bootstrap token")
token, err := oc.createBootstrapToken()
if err != nil {
return oc.handleMachineError(machine, apierrors.CreateMachine(
"error creating Openstack instance: %v", err))
"error creating Openstack instance: %v", err), createEventAction)
}
userDataRendered, err = nodeStartupScript(cluster, machine, token, string(userData))
if err != nil {
return oc.handleMachineError(machine, apierrors.CreateMachine(
"error creating Openstack instance: %v", err))
"error creating Openstack instance: %v", err), createEventAction)
}
}
} else {
Expand Down Expand Up @@ -244,7 +255,7 @@ func (oc *OpenstackClient) Create(ctx context.Context, cluster *clusterv1.Cluste

if err != nil {
return oc.handleMachineError(machine, apierrors.CreateMachine(
"error creating Openstack instance: %v", err))
"error creating Openstack instance: %v", err), createEventAction)
}
instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", TimeoutInstanceCreate)
instanceCreateTimeout = instanceCreateTimeout * time.Minute
Expand All @@ -257,14 +268,14 @@ func (oc *OpenstackClient) Create(ctx context.Context, cluster *clusterv1.Cluste
})
if err != nil {
return oc.handleMachineError(machine, apierrors.CreateMachine(
"error creating Openstack instance: %v", err))
"error creating Openstack instance: %v", err), createEventAction)
}

if providerSpec.FloatingIP != "" {
err := machineService.AssociateFloatingIP(instance.ID, providerSpec.FloatingIP)
if err != nil {
return oc.handleMachineError(machine, apierrors.CreateMachine(
"Associate floatingIP err: %v", err))
"Associate floatingIP err: %v", err), createEventAction)
}

}
Expand All @@ -274,6 +285,7 @@ func (oc *OpenstackClient) Create(ctx context.Context, cluster *clusterv1.Cluste
return nil
}

oc.eventRecorder.Eventf(machine, corev1.EventTypeNormal, "Created", "Created Machine %v", machine.Name)
return oc.updateAnnotation(machine, instance.ID)
}

Expand All @@ -297,9 +309,10 @@ func (oc *OpenstackClient) Delete(ctx context.Context, cluster *clusterv1.Cluste
err = machineService.InstanceDelete(id)
if err != nil {
return oc.handleMachineError(machine, apierrors.DeleteMachine(
"error deleting Openstack instance: %v", err))
"error deleting Openstack instance: %v", err), deleteEventAction)
}

oc.eventRecorder.Eventf(machine, corev1.EventTypeNormal, "Deleted", "Deleted machine %v", machine.Name)
return nil
}

Expand Down Expand Up @@ -349,30 +362,29 @@ func (oc *OpenstackClient) Update(ctx context.Context, cluster *clusterv1.Cluste
if err != nil {
klog.Errorf("delete machine %s for update failed: %v", currentMachine.ObjectMeta.Name, err)
return fmt.Errorf("Cannot delete machine %s: %v", currentMachine.ObjectMeta.Name, err)
} else {
instanceDeleteTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_DELETE_TIMEOUT", TimeoutInstanceDelete)
instanceDeleteTimeout = instanceDeleteTimeout * time.Minute
err = util.PollImmediate(RetryIntervalInstanceStatus, instanceDeleteTimeout, func() (bool, error) {
instance, err := oc.instanceExists(machine)
if err != nil {
return false, nil
}
return instance == nil, nil
})
if err != nil {
return oc.handleMachineError(machine, apierrors.DeleteMachine(
"error deleting Openstack instance: %v", err))
}

err = oc.Create(ctx, cluster, machine)
}
instanceDeleteTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_DELETE_TIMEOUT", TimeoutInstanceDelete)
instanceDeleteTimeout = instanceDeleteTimeout * time.Minute
err = util.PollImmediate(RetryIntervalInstanceStatus, instanceDeleteTimeout, func() (bool, error) {
instance, err := oc.instanceExists(machine)
if err != nil {
klog.Errorf("create machine %s for update failed: %v", machine.ObjectMeta.Name, err)
return fmt.Errorf("Cannot create machine %s: %v", machine.ObjectMeta.Name, err)
return false, nil
}
klog.Infof("Successfully updated machine %s", currentMachine.ObjectMeta.Name)
return instance == nil, nil
})
if err != nil {
return oc.handleMachineError(machine, apierrors.DeleteMachine(
"error deleting Openstack instance: %v", err), deleteEventAction)
}
err = oc.Create(ctx, cluster, machine)
if err != nil {
klog.Errorf("create machine %s for update failed: %v", machine.ObjectMeta.Name, err)
return fmt.Errorf("Cannot create machine %s: %v", machine.ObjectMeta.Name, err)
}
klog.Infof("Successfully updated machine %s", currentMachine.ObjectMeta.Name)
}

oc.eventRecorder.Eventf(currentMachine, corev1.EventTypeNormal, "Updated", "Updated machine %v", currentMachine.ObjectMeta.Name, updateEventAction)
return nil
}

Expand Down Expand Up @@ -424,7 +436,10 @@ func getIPFromInstance(instance *clients.Instance) (string, error) {
// the appropriate reason/message on the Machine.Status. If not, such as during
// cluster installation, it will operate as a no-op. It also returns the
// original error for convenience, so callers can do "return handleMachineError(...)".
func (oc *OpenstackClient) handleMachineError(machine *machinev1.Machine, err *apierrors.MachineError) error {
func (oc *OpenstackClient) handleMachineError(machine *machinev1.Machine, err *apierrors.MachineError, eventAction string) error {
if eventAction != noEventAction {
oc.eventRecorder.Eventf(machine, corev1.EventTypeWarning, "Failed"+eventAction, "%v", err.Reason)
}
if oc.client != nil {
reason := err.Reason
message := err.Message
Expand Down