update reconcile func

Signed-off-by: Jeeva Kandasamy <jkandasa@gmail.com>

Author: jkandasa

api/v1/mycontroller_types.go

@@ -21,6 +21,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+var (
+	MyControllerPhaseFailed  = "Failed"
+	MyControllerPhaseRunning = "Running"
+)
+
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
@@ -35,11 +40,11 @@ type MyControllerSpec struct {
 	Secret           string              `json:"secret"`
 	DisableAnalytics bool                `json:"disable_analytics"`
 	LogLevel         string              `json:"log_level"`
-	Storage          MyControllerStorage `json:"storage"`
+	Storage          MyControllerStorage `json:"storage,omitempty"`
 }
 
 type MyControllerStorage struct {
-	StorageClassName string             `json:"storage_class_name"`
+	StorageClassName string             `json:"storage_class_name,omitempty"`
 	SizeData         *resource.Quantity `json:"data_size,omitempty"`
 	SizeMetric       *resource.Quantity `json:"metric_size,omitempty"`
 }
@@ -48,10 +53,13 @@ type MyControllerStorage struct {
 type MyControllerStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+	Phase string `json:"phase"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase",description="MyController instance's status"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // MyController is the Schema for the mycontrollers API
 type MyController struct {

config/crd/bases/mycontroller.org_mycontrollers.yaml

@@ -16,7 +16,15 @@ spec:
     singular: mycontroller
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - description: MyController instance's status
+      jsonPath: .status.phase
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         description: MyController is the Schema for the mycontrollers API
@@ -58,17 +66,22 @@ spec:
                     x-kubernetes-int-or-string: true
                   storage_class_name:
                     type: string
-                required:
-                - storage_class_name
                 type: object
             required:
             - disable_analytics
             - log_level
             - secret
-            - storage
             type: object
           status:
             description: MyControllerStatus defines the observed state of MyController
+            properties:
+              phase:
+                description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
+                  of cluster Important: Run "make" to regenerate code after modifying
+                  this file'
+                type: string
+            required:
+            - phase
             type: object
         type: object
     served: true

controllers/helper.go

@@ -0,0 +1,39 @@
+package controllers
+
+import (
+	"os"
+
+	"k8s.io/client-go/discovery"
+	ctrl "sigs.k8s.io/controller-runtime"
+)
+
+var openshiftPlatform = false
+
+func isOpenshift() bool {
+	return openshiftPlatform
+}
+
+func updatePlatform(mgr ctrl.Manager) error {
+	log := mgr.GetLogger()
+	// update platform
+	dClient, err := discovery.NewDiscoveryClientForConfig(mgr.GetConfig())
+	if err != nil {
+		log.Error(err, "problem getting platform details")
+		return err
+	}
+
+	apiList, err := dClient.ServerGroups()
+	if err != nil {
+		log.Error(err, "problem getting platform details")
+		os.Exit(1)
+	}
+
+	apiGroups := apiList.Groups
+	for _, group := range apiGroups {
+		if group.Name == "route.openshift.io" {
+			openshiftPlatform = true
+		}
+	}
+	log.Info("platform detail", "is_openshift", openshiftPlatform)
+	return nil
+}

controllers/mycontroller_controller.go

@@ -19,7 +19,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"os"
 
 	routev1 "github.com/openshift/api/route/v1"
 	"gopkg.in/yaml.v2"
@@ -63,6 +62,8 @@ type MyControllerReconciler struct {
 func (r *MyControllerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := ctrllog.FromContext(ctx)
 
+	log.Info("reconcile triggered", "namespace", req.Namespace, "name", req.Name)
+
 	// fetch the MyController instance
 	myController := &mycontrollerv1.MyController{}
 	err := r.Get(ctx, req.NamespacedName, myController)
@@ -83,30 +84,58 @@ func (r *MyControllerReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	found := &appsv1.Deployment{}
 	err = r.Get(ctx, types.NamespacedName{Name: myController.Name, Namespace: myController.Namespace}, found)
 	if err != nil && errors.IsNotFound(err) {
+		err = r.removeMyController(ctx, myController)
+		if err != nil {
+			log.Error(err, "failed to remove existing resources")
+			return ctrl.Result{}, err
+		}
 		err = r.setupMyController(ctx, myController)
 		if err != nil {
 			log.Error(err, "failed to setup mycontroller")
 			return ctrl.Result{}, err
 		}
+
+		myController.Status.Phase = mycontrollerv1.MyControllerPhaseRunning
+		if err = r.Client.Status().Update(ctx, myController); err != nil {
+			log.Error(err, "failed to update status")
+		}
 		// deployed successfully - return and requeue
 		return ctrl.Result{Requeue: true}, nil
 	} else if err != nil {
 		log.Error(err, "failed to get Deployment")
 		return ctrl.Result{}, err
 	}
 
+	// TODO: verify the existing installation status and reconcile, if there is a need
+
 	return ctrl.Result{}, nil
 }
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *MyControllerReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	log := mgr.GetLogger()
+
+	// update platform
+	err := updatePlatform(mgr)
+	if err != nil {
+		return err
+	}
+
+	// Adding the routev1
+	if isOpenshift() {
+		if err := routev1.AddToScheme(mgr.GetScheme()); err != nil {
+			log.Error(err, "")
+			return err
+		}
+	}
+
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&mycontrollerv1.MyController{}).
 		Owns(&appsv1.Deployment{}).
 		Complete(r)
 }
 
-func (r *MyControllerReconciler) setupMyController(ctx context.Context, m *mycontrollerv1.MyController) error {
+func (r *MyControllerReconciler) removeMyController(ctx context.Context, m *mycontrollerv1.MyController) error {
 	// delete existing resources and create new resources
 	// delete deployment
 	err := r.Delete(ctx, &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Namespace: m.Namespace, Name: m.Name}})
@@ -119,7 +148,7 @@ func (r *MyControllerReconciler) setupMyController(ctx context.Context, m *mycon
 		return err
 	}
 	// delete route
-	if os.Getenv("is_opensift") == "true" {
+	if isOpenshift() {
 		err = r.Delete(ctx, &routev1.Route{ObjectMeta: metav1.ObjectMeta{Namespace: m.Namespace, Name: m.Name}})
 		if err != nil && !errors.IsNotFound(err) {
 			return err
@@ -130,9 +159,12 @@ func (r *MyControllerReconciler) setupMyController(ctx context.Context, m *mycon
 	if err != nil && !errors.IsNotFound(err) {
 		return err
 	}
+	return nil
+}
 
+func (r *MyControllerReconciler) setupMyController(ctx context.Context, m *mycontrollerv1.MyController) error {
 	// create configmap
-	err = r.createConfigMap(ctx, m)
+	err := r.createConfigMap(ctx, m)
 	if err != nil {
 		return err
 	}
@@ -204,27 +236,7 @@ func (r *MyControllerReconciler) deployMyController(ctx context.Context, m *myco
 					Labels: ls,
 				},
 				Spec: corev1.PodSpec{
-					Containers: []corev1.Container{{
-						Image:   "quay.io/mycontroller/server:master",
-						Name:    "mycontroller",
-						Command: []string{"/app/mycontroller-server", "-config", "/app/mycontroller.yaml"},
-						Ports: []corev1.ContainerPort{{
-							ContainerPort: 8080,
-							Name:          "mycontroller",
-						}},
-						VolumeMounts: []corev1.VolumeMount{
-							{
-								Name:      "myc-data-dir",
-								MountPath: "/mc_home",
-							},
-							{
-								Name:      "myc-config",
-								MountPath: "/app/mycontroller.yaml",
-								SubPath:   "mycontroller.yaml",
-								ReadOnly:  true,
-							},
-						},
-					},
+					Containers: []corev1.Container{
 						{
 							Name:  "influxdb",
 							Image: "influxdb:1.8.4",
@@ -236,6 +248,47 @@ func (r *MyControllerReconciler) deployMyController(ctx context.Context, m *myco
 								Name:      "myc-metric-dir",
 								MountPath: "/var/lib/influxdb",
 							}},
+							LivenessProbe: &corev1.Probe{
+								InitialDelaySeconds: 7000,
+								Handler: corev1.Handler{
+									HTTPGet: &corev1.HTTPGetAction{
+										Path:   "health",
+										Port:   intstr.FromInt(8086),
+										Scheme: corev1.URISchemeHTTP,
+									},
+								},
+							},
+						},
+						{
+							Image:   "quay.io/mycontroller/server:master",
+							Name:    "mycontroller",
+							Command: []string{"/app/mycontroller-server", "-config", "/app/mycontroller.yaml"},
+							Ports: []corev1.ContainerPort{{
+								ContainerPort: 8080,
+								Name:          "mycontroller",
+							}},
+							VolumeMounts: []corev1.VolumeMount{
+								{
+									Name:      "myc-data-dir",
+									MountPath: "/mc_home",
+								},
+								{
+									Name:      "myc-config",
+									MountPath: "/app/mycontroller.yaml",
+									SubPath:   "mycontroller.yaml",
+									ReadOnly:  true,
+								},
+							},
+							LivenessProbe: &corev1.Probe{
+								InitialDelaySeconds: 5000,
+								Handler: corev1.Handler{
+									HTTPGet: &corev1.HTTPGetAction{
+										Path:   "api/status",
+										Port:   intstr.FromInt(8080),
+										Scheme: corev1.URISchemeHTTP,
+									},
+								},
+							},
 						}},
 					Volumes: []corev1.Volume{
 						dataVolume,
@@ -251,7 +304,7 @@ func (r *MyControllerReconciler) deployMyController(ctx context.Context, m *myco
 			},
 		},
 	}
-	// Set Memcached instance as the owner and controller
+	// Set MyController instance as the owner and controller
 	ctrl.SetControllerReference(m, mycDeployment, r.Scheme)
 	err := r.Create(ctx, mycDeployment)
 	if err != nil {
@@ -418,7 +471,7 @@ func (r *MyControllerReconciler) createService(ctx context.Context, m *mycontrol
 
 func (r *MyControllerReconciler) createRoute(ctx context.Context, m *mycontrollerv1.MyController) error {
 	// if it is a openshift platform continue or exit
-	if os.Getenv("is_openshift") != "true" {
+	if !isOpenshift() {
 		return nil
 	}
 
@@ -434,7 +487,7 @@ func (r *MyControllerReconciler) createRoute(ctx context.Context, m *mycontrolle
 			TLS:  &routev1.TLSConfig{},
 		},
 	}
-	// Set Memcached instance as the owner and controller
+	// Set MyController instance as the owner and controller
 	ctrl.SetControllerReference(m, mycRoute, r.Scheme)
 
 	err := r.Create(ctx, mycRoute)

main.go

@@ -22,10 +22,8 @@ import (
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
-	"k8s.io/client-go/discovery"
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	routev1 "github.com/openshift/api/route/v1"
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -99,39 +97,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Adding the routev1
-	if err := routev1.AddToScheme(mgr.GetScheme()); err != nil {
-		setupLog.Error(err, "")
-		os.Exit(1)
-	}
-
-	// update platform
-	dClient, err := discovery.NewDiscoveryClientForConfig(mgr.GetConfig())
-	if err != nil {
-		setupLog.Error(err, "problem getting platform details")
-		os.Exit(1)
-	}
-
-	apiList, err := dClient.ServerGroups()
-	if err != nil {
-		setupLog.Error(err, "problem getting platform details")
-		os.Exit(1)
-	}
-
-	err = os.Setenv("is_openshift", "false")
-	if err != nil {
-		setupLog.Error(err, "problem setting environment 'is_openshift'")
-	}
-	apiGroups := apiList.Groups
-	for _, group := range apiGroups {
-		if group.Name == "route.openshift.io" {
-			err = os.Setenv("is_openshift", "true")
-			if err != nil {
-				setupLog.Error(err, "problem setting environment 'is_openshift'")
-			}
-		}
-	}
-
 	setupLog.Info("starting manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")