aboutsummaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorRitu Sood <ritu.sood@intel.com>2019-08-09 11:24:26 -0700
committerRitu Sood <Ritu.Sood@intel.com>2019-08-16 13:06:16 +0000
commita6c37bf8c9c1e9f5072bfc3e43b6ec0061ee2108 (patch)
treeed3530b053600017c5ce5d7a07a04e531c6a98fe /pkg
parent8fe5ed0f2cc522d22d0ca556f48f2e5922c67d3e (diff)
Add CRD Controller for Network
Add CRD controller functionality for Network creation and deletion. Related generated code is uploaded in patch: https://gerrit.opnfv.org/gerrit/#/c/ovn4nfv-k8s-plugin/+/68324/ Change-Id: Ibd3e652edc56aa1084f684438597e1b978977bbf Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/apis/k8s/v1alpha1/network_types.go6
-rw-r--r--pkg/controller/add_network.go10
-rw-r--r--pkg/controller/network/network_controller.go189
-rw-r--r--pkg/utils/finalizer_utils.go20
4 files changed, 223 insertions, 2 deletions
diff --git a/pkg/apis/k8s/v1alpha1/network_types.go b/pkg/apis/k8s/v1alpha1/network_types.go
index a52dd58..a606dbb 100644
--- a/pkg/apis/k8s/v1alpha1/network_types.go
+++ b/pkg/apis/k8s/v1alpha1/network_types.go
@@ -42,8 +42,10 @@ type DnsSpec struct {
const (
//Created indicates the status of success
Created = "Created"
- //Indicates internal Irrecoverable Error
- InternalError = "InternalError"
+ //CreateInternalError indicates create internal irrecoverable Error
+ CreateInternalError = "CreateInternalError"
+ //DeleteInternalError indicates delete internal irrecoverable Error
+ DeleteInternalError = "DeleteInternalError"
)
// NetworkStatus defines the observed state of Network
diff --git a/pkg/controller/add_network.go b/pkg/controller/add_network.go
new file mode 100644
index 0000000..d35657b
--- /dev/null
+++ b/pkg/controller/add_network.go
@@ -0,0 +1,10 @@
+package controller
+
+import (
+ "ovn4nfv-k8s-plugin/pkg/controller/network"
+)
+
+func init() {
+ // AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
+ AddToManagerFuncs = append(AddToManagerFuncs, network.Add)
+}
diff --git a/pkg/controller/network/network_controller.go b/pkg/controller/network/network_controller.go
new file mode 100644
index 0000000..2392e3d
--- /dev/null
+++ b/pkg/controller/network/network_controller.go
@@ -0,0 +1,189 @@
+package network
+
+import (
+ "context"
+ "fmt"
+ k8sv1alpha1 "ovn4nfv-k8s-plugin/pkg/apis/k8s/v1alpha1"
+
+ // corev1 "k8s.io/api/core/v1"
+ "github.com/go-logr/logr"
+ "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/apimachinery/pkg/runtime"
+ "ovn4nfv-k8s-plugin/internal/pkg/ovn"
+ "ovn4nfv-k8s-plugin/pkg/utils"
+ "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/controller"
+ "sigs.k8s.io/controller-runtime/pkg/handler"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/reconcile"
+ logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+ "sigs.k8s.io/controller-runtime/pkg/source"
+)
+
+var log = logf.Log.WithName("network_controller")
+
+// Add creates a new Network Controller and adds it to the Manager. The Manager will set fields on the Controller
+// and Start it when the Manager is Started.
+func Add(mgr manager.Manager) error {
+ return add(mgr, newReconciler(mgr))
+}
+
+// newReconciler returns a new reconcile.Reconciler
+func newReconciler(mgr manager.Manager) reconcile.Reconciler {
+ return &ReconcileNetwork{client: mgr.GetClient(), scheme: mgr.GetScheme()}
+}
+
+// add adds a new Controller to mgr with r as the reconcile.Reconciler
+func add(mgr manager.Manager, r reconcile.Reconciler) error {
+ // Create a new controller
+ c, err := controller.New("network-controller", mgr, controller.Options{Reconciler: r})
+ if err != nil {
+ return err
+ }
+ // Watch for changes to primary resource Network
+ err = c.Watch(&source.Kind{Type: &k8sv1alpha1.Network{}}, &handler.EnqueueRequestForObject{})
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+// blank assignment to verify that ReconcileNetwork implements reconcile.Reconciler
+var _ reconcile.Reconciler = &ReconcileNetwork{}
+
+// ReconcileNetwork reconciles a Network object
+type ReconcileNetwork struct {
+ // This client, initialized using mgr.Client() above, is a split client
+ // that reads objects from the cache and writes to the apiserver
+ client client.Client
+ scheme *runtime.Scheme
+}
+type reconcileFun func(instance *k8sv1alpha1.Network, reqLogger logr.Logger) error
+
+// Reconcile reads that state of the cluster for a Network object and makes changes based on the state read
+// and what is in the Network.Spec
+// The Controller will requeue the Request to be processed again if the returned error is non-nil or
+// Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
+func (r *ReconcileNetwork) Reconcile(request reconcile.Request) (reconcile.Result, error) {
+ reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
+ reqLogger.V(1).Info("Reconciling Network")
+
+ // Fetch the Network instance
+ instance := &k8sv1alpha1.Network{}
+ err := r.client.Get(context.TODO(), request.NamespacedName, instance)
+ if err != nil {
+ if errors.IsNotFound(err) {
+ // Request object not found, could have been deleted after reconcile request.
+ // Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
+ // Return and don't requeue
+ reqLogger.V(1).Info("Network Object not found")
+ return reconcile.Result{}, nil
+ }
+ // Error reading the object - requeue the request.
+ return reconcile.Result{}, err
+ }
+ for _, fun := range []reconcileFun{
+ r.reconcileFinalizers,
+ r.createNetwork,
+ } {
+ if err = fun(instance, reqLogger); err != nil {
+ return reconcile.Result{}, err
+ }
+ }
+ return reconcile.Result{}, nil
+}
+
+const (
+ nfnNetworkFinalizer = "nfnCleanUpNetwork"
+)
+
+func (r *ReconcileNetwork) createNetwork(cr *k8sv1alpha1.Network, reqLogger logr.Logger) error {
+
+ if !cr.DeletionTimestamp.IsZero() {
+ // Marked for deletion
+ return nil
+ }
+ switch {
+ case cr.Spec.CniType == "ovn4nfv":
+ ovnCtl, err := ovn.GetOvnController()
+ if err != nil {
+ return err
+ }
+ err = ovnCtl.CreateNetwork(cr)
+ if err != nil {
+ // Log the error
+ reqLogger.Error(err, "Error Creating Network")
+ cr.Status.State = k8sv1alpha1.CreateInternalError
+ } else {
+ cr.Status.State = k8sv1alpha1.Created
+ }
+ err = r.client.Status().Update(context.TODO(), cr)
+ if err != nil {
+ return err
+ }
+ // If OVN internal error don't requeue
+ return nil
+ // Add other CNI types here
+ }
+ reqLogger.Info("CNI type not supported", "name", cr.Spec.CniType)
+ return fmt.Errorf("CNI type not supported")
+
+}
+
+func (r *ReconcileNetwork) deleteNetwork(cr *k8sv1alpha1.Network, reqLogger logr.Logger) error {
+
+ switch {
+ case cr.Spec.CniType == "ovn4nfv":
+ ovnCtl, err := ovn.GetOvnController()
+ if err != nil {
+ return err
+ }
+ err = ovnCtl.DeleteNetwork(cr)
+ if err != nil {
+ // Log the error
+ reqLogger.Error(err, "Error Delete Network")
+ cr.Status.State = k8sv1alpha1.DeleteInternalError
+ err = r.client.Status().Update(context.TODO(), cr)
+ if err != nil {
+ return err
+ }
+ }
+ // If OVN internal error don't requeue
+ return nil
+ // Add other CNI types here
+ }
+ reqLogger.Info("CNI type not supported", "name", cr.Spec.CniType)
+ return fmt.Errorf("CNI type not supported")
+}
+
+func (r *ReconcileNetwork) reconcileFinalizers(instance *k8sv1alpha1.Network, reqLogger logr.Logger) (err error) {
+
+ if !instance.DeletionTimestamp.IsZero() {
+ // Instance marked for deletion
+ if utils.Contains(instance.ObjectMeta.Finalizers, nfnNetworkFinalizer) {
+ reqLogger.V(1).Info("Finalizer found - delete network")
+ if err = r.deleteNetwork(instance, reqLogger); err != nil {
+ reqLogger.Error(err, "Delete network")
+ }
+ // Remove the finalizer even if Delete Network fails. Fatal error retry will not resolve
+ instance.ObjectMeta.Finalizers = utils.Remove(instance.ObjectMeta.Finalizers, nfnNetworkFinalizer)
+ if err = r.client.Update(context.TODO(), instance); err != nil {
+ reqLogger.Error(err, "Removing Finalize")
+ return err
+ }
+ }
+
+ } else {
+ // If finalizer doesn't exist add it
+ if !utils.Contains(instance.GetFinalizers(), nfnNetworkFinalizer) {
+ instance.SetFinalizers(append(instance.GetFinalizers(), nfnNetworkFinalizer))
+ if err = r.client.Update(context.TODO(), instance); err != nil {
+ reqLogger.Error(err, "Adding Finalize")
+ return err
+ }
+ reqLogger.V(1).Info("Finalizer added")
+ }
+ }
+ return nil
+}
diff --git a/pkg/utils/finalizer_utils.go b/pkg/utils/finalizer_utils.go
new file mode 100644
index 0000000..5f196c0
--- /dev/null
+++ b/pkg/utils/finalizer_utils.go
@@ -0,0 +1,20 @@
+package utils
+
+func Contains(slice []string, str string) bool {
+ for _, item := range slice {
+ if item == str {
+ return true
+ }
+ }
+ return false
+}
+
+func Remove(slice []string, str string) (result []string) {
+ for _, item := range slice {
+ if item == str {
+ continue
+ }
+ result = append(result, item)
+ }
+ return result
+}