aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2019-05-28 15:06:16 -0700
committerGary Wu <gwu@futurewei.com>2019-05-30 20:40:17 +0000
commitc6bda8ada5ba1d02e0c9f1ab480993e97ea40509 (patch)
treef78de67232b6d3db604554880785b5d5760a668a
parent20d2faee7b9a36a50371854a3688b6421a70ebcb (diff)
Collectd Operator - Controller
Initial code for CollectdPlugin CRD controller. Watches the CollectdPlugin CRDs and create/update configmap and restart the Collectd Daemonset pods. Issue-ID: ONAPARC-461 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com> Change-Id: I24f7bebaefb8a0587029da55dee1934e8679ef96
-rw-r--r--vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go10
-rw-r--r--vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go215
2 files changed, 225 insertions, 0 deletions
diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go b/vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go
new file mode 100644
index 00000000..da8d1e1d
--- /dev/null
+++ b/vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go
@@ -0,0 +1,10 @@
+package controller
+
+import (
+ "demo/vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin"
+)
+
+func init() {
+ // AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
+ AddToManagerFuncs = append(AddToManagerFuncs, collectdplugin.Add)
+}
diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go b/vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
new file mode 100644
index 00000000..77d7e157
--- /dev/null
+++ b/vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
@@ -0,0 +1,215 @@
+package collectdplugin
+
+import (
+ "context"
+ "crypto/sha256"
+
+ onapv1alpha1 "demo/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1"
+
+ corev1 "k8s.io/api/core/v1"
+ extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
+ "k8s.io/apimachinery/pkg/api/errors"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+ "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/controller"
+ "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+ "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("controller_collectdplugin")
+
+// ResourceMap to hold objects to update/reload
+type ResourceMap struct {
+ configMap *corev1.ConfigMap
+ daemonSet *extensionsv1beta1.DaemonSet
+}
+
+/**
+* USER ACTION REQUIRED: This is a scaffold file intended for the user to modify with their own Controller
+* business logic. Delete these comments after modifying this file.*
+ */
+
+// Add creates a new CollectdPlugin 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 &ReconcileCollectdPlugin{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
+ log.V(1).Info("Creating a new controller for CollectdPlugin")
+ c, err := controller.New("collectdplugin-controller", mgr, controller.Options{Reconciler: r})
+ if err != nil {
+ return err
+ }
+
+ // Watch for changes to primary resource CollectdPlugin
+ log.V(1).Info("Add watcher for primary resource CollectdPlugin")
+ err = c.Watch(&source.Kind{Type: &onapv1alpha1.CollectdPlugin{}}, &handler.EnqueueRequestForObject{})
+ if err != nil {
+ return err
+ }
+
+ // TODO(user): Modify this to be the types you create that are owned by the primary resource
+ // Watch for changes to secondary resource Pods and requeue the owner CollectdPlugin
+ log.V(1).Info("Add watcher for secondary resource ConfigMap")
+ err = c.Watch(&source.Kind{Type: &corev1.ConfigMap{}}, &handler.EnqueueRequestForOwner{
+ IsController: true,
+ OwnerType: &onapv1alpha1.CollectdPlugin{},
+ })
+ if err != nil {
+ return err
+ }
+
+ err = c.Watch(&source.Kind{Type: &extensionsv1beta1.DaemonSet{}}, &handler.EnqueueRequestForOwner{
+ IsController: true,
+ OwnerType: &onapv1alpha1.CollectdPlugin{},
+ })
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+// blank assignment to verify that ReconcileCollectdPlugin implements reconcile.Reconciler
+var _ reconcile.Reconciler = &ReconcileCollectdPlugin{}
+
+// ReconcileCollectdPlugin reconciles a CollectdPlugin object
+type ReconcileCollectdPlugin 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
+}
+
+// Reconcile reads that state of the cluster for a CollectdPlugin object and makes changes based on the state read
+// and what is in the CollectdPlugin.Spec
+// TODO(user): Modify this Reconcile function to implement your Controller logic. This example creates
+// a Pod as an example
+// Note:
+// 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 *ReconcileCollectdPlugin) Reconcile(request reconcile.Request) (reconcile.Result, error) {
+ reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
+ reqLogger.Info("Reconciling CollectdPlugin")
+
+ // Fetch the CollectdPlugin instance
+ instance := &onapv1alpha1.CollectdPlugin{}
+ 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("CollectdPlugin object Not found")
+ return reconcile.Result{}, nil
+ }
+ // Error reading the object - requeue the request.
+ reqLogger.V(1).Info("Error reading the CollectdPlugin object, Requeuing")
+ return reconcile.Result{}, err
+ }
+
+ rmap, err := findResourceMapForCR(r, instance)
+ if err != nil {
+ reqLogger.Info("Skip reconcile: ConfigMap not found")
+ return reconcile.Result{}, err
+ }
+
+ cm := rmap.configMap
+ ds := rmap.daemonSet
+ reqLogger.V(1).Info("Found ResourceMap")
+ reqLogger.V(1).Info("ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
+ reqLogger.V(1).Info("DaemonSet.Namespace", ds.Namespace, "DaemonSet.Name", ds.Name)
+ // Set CollectdPlugin instance as the owner and controller
+ if err := controllerutil.SetControllerReference(instance, cm, r.scheme); err != nil {
+ return reconcile.Result{}, err
+ }
+ // Set CollectdConf instance as the owner and controller
+ if err := controllerutil.SetControllerReference(instance, ds, r.scheme); err != nil {
+ return reconcile.Result{}, err
+ }
+
+ // Update the ConfigMap with new Spec and reload DaemonSets
+ reqLogger.Info("Updating the ConfigMap", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
+ log.Info("Map: ", cm.Data)
+ err = r.client.Update(context.TODO(), cm)
+ if err != nil {
+ return reconcile.Result{}, err
+ }
+
+ //Restart Collectd Pods
+
+ ds.Spec.Template.SetLabels(map[string]string{
+ "daaas-random": ComputeSHA256([]byte("TEST")),
+ })
+ // Reconcile success
+ reqLogger.Info("Updated the ConfigMap", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
+ return reconcile.Result{}, nil
+}
+
+// ComputeSHA256 returns hash of data as string
+func ComputeSHA256(data []byte) string {
+ hash := sha256.Sum256(data)
+ return string(hash[:])
+}
+
+// findConfigMapForCR returns the configMap used by collectd Daemonset
+func findResourceMapForCR(r *ReconcileCollectdPlugin, cr *onapv1alpha1.CollectdPlugin) (ResourceMap, error) {
+ cmList := &corev1.ConfigMapList{}
+ opts := &client.ListOptions{}
+ rmap := ResourceMap{}
+
+ // Select ConfigMaps with label app=collectd
+ opts.SetLabelSelector("app=collectd")
+ opts.InNamespace(cr.Namespace)
+ err := r.client.List(context.TODO(), opts, cmList)
+ if err != nil {
+ return rmap, err
+ }
+
+ // Select DaemonSets with label app=collectd
+ dsList := &extensionsv1beta1.DaemonSet{}
+ err = r.client.List(context.TODO(), opts, dsList)
+ if err != nil {
+ return rmap, err
+ }
+
+ rmap.configMap = &cmList.Items[0]
+ rmap.daemonSet = dsList
+ return rmap, err
+}
+
+// newPodForCR returns a busybox pod with the same name/namespace as the cr
+func newPodForCR(cr *onapv1alpha1.CollectdPlugin) *corev1.Pod {
+ labels := map[string]string{
+ "app": cr.Name,
+ }
+ return &corev1.Pod{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: cr.Name + "-pod",
+ Namespace: cr.Namespace,
+ Labels: labels,
+ },
+ Spec: corev1.PodSpec{
+ Containers: []corev1.Container{
+ {
+ Name: "busybox",
+ Image: "busybox",
+ Command: []string{"sleep", "3600"},
+ },
+ },
+ },
+ }
+}