Skip to content
Snippets Groups Projects
Commit 2ee9d0e8 authored by Alejandro Tjaarda's avatar Alejandro Tjaarda
Browse files

operator: code clean up

parent 3077ee88
No related branches found
No related tags found
1 merge request!2repo: added new directory where utils scripts will be
...@@ -89,11 +89,11 @@ func (r *OverlayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct ...@@ -89,11 +89,11 @@ func (r *OverlayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
// The object is being deleted // The object is being deleted
if controllerutil.ContainsFinalizer(overlay, l2smFinalizer) { if controllerutil.ContainsFinalizer(overlay, l2smFinalizer) {
// our finalizer is present, so lets handle any external dependency // our finalizer is present, so lets handle any external dependency
if err := r.deleteExternalResources(ctx, overlay); err != nil { // if err := r.deleteExternalResources(ctx, overlay); err != nil {
// if fail to delete the external dependency here, return with error // // if fail to delete the external dependency here, return with error
// so that it can be retried. // // so that it can be retried.
return ctrl.Result{}, err // return ctrl.Result{}, err
} // }
// remove our finalizer from the list and update it. // remove our finalizer from the list and update it.
controllerutil.RemoveFinalizer(overlay, l2smFinalizer) controllerutil.RemoveFinalizer(overlay, l2smFinalizer)
...@@ -120,11 +120,12 @@ func (r *OverlayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct ...@@ -120,11 +120,12 @@ func (r *OverlayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
} }
log.Info("Overlay Launched") log.Info("Overlay Launched")
return ctrl.Result{RequeueAfter: time.Second * 20}, nil return ctrl.Result{RequeueAfter: time.Second * 20}, nil
} else { }
// else {
//b, _ := json.Marshal(netEdgeDevice.Spec.Neighbors) // //b, _ := json.Marshal(netEdgeDevice.Spec.Neighbors)
} // }
return ctrl.Result{}, nil return ctrl.Result{}, nil
} }
...@@ -154,10 +155,10 @@ func (r *OverlayReconciler) SetupWithManager(mgr ctrl.Manager) error { ...@@ -154,10 +155,10 @@ func (r *OverlayReconciler) SetupWithManager(mgr ctrl.Manager) error {
Complete(r) Complete(r)
} }
func (r *OverlayReconciler) deleteExternalResources(ctx context.Context, overlay *l2smv1.Overlay) error { // func (r *OverlayReconciler) deleteExternalResources(ctx context.Context, overlay *l2smv1.Overlay) error {
return nil // return nil
} // }
type TopologySwitchJson struct { type TopologySwitchJson struct {
Nodes []NodeJson `json:"Nodes"` Nodes []NodeJson `json:"Nodes"`
...@@ -189,9 +190,7 @@ func (r *OverlayReconciler) createExternalResources(ctx context.Context, overlay ...@@ -189,9 +190,7 @@ func (r *OverlayReconciler) createExternalResources(ctx context.Context, overlay
} }
// Populate Links // Populate Links
for _, link := range overlay.Spec.Topology.Links { topologySwitch.Links = append(topologySwitch.Links, overlay.Spec.Topology.Links...)
topologySwitch.Links = append(topologySwitch.Links, link)
}
// Convert TopologySwitchJson to JSON // Convert TopologySwitchJson to JSON
topologyJSON, err := json.Marshal(topologySwitch) topologyJSON, err := json.Marshal(topologySwitch)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment