Merge pull request #366 from gkurz/fix-2593

Fix upgrade from OSC 1.4.1
openshift · Dec 8, 2023 · e60ed4b · e60ed4b
2 parents 9d1e2e7 + 3e6f490
commit e60ed4b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 45 deletions.
diff --git a/api/v1/kataconfig_types.go b/api/v1/kataconfig_types.go
@@ -48,9 +48,9 @@ type KataConfigSpec struct {
 
 // KataConfigStatus defines the observed state of KataConfig
 type KataConfigStatus struct {
-	// RuntimeClass is the names of the RuntimeClasses created by this controller
+	// RuntimeClasses is the names of the RuntimeClasses created by this controller
 	// +optional
-	RuntimeClass []string `json:"runtimeClass"`
+	RuntimeClasses []string `json:"runtimeClasses"`
 
 	// +optional
 	KataNodes KataNodesStatus `json:"kataNodes,omitempty"`

diff --git a/controllers/openshift_controller.go b/controllers/openshift_controller.go
@@ -165,42 +165,6 @@ func (r *KataConfigOpenShiftReconciler) Reconcile(ctx context.Context, req ctrl.
 			return ctrl.Result{}, updateErr
 		}
 
-		ds := r.processDaemonsetForMonitor()
-		// Set KataConfig instance as the owner and controller
-		if err := controllerutil.SetControllerReference(r.kataConfig, ds, r.Scheme); err != nil {
-			r.Log.Error(err, "failed to set controller reference on the monitor daemonset")
-			return ctrl.Result{}, err
-		}
-		r.Log.Info("controller reference set for the monitor daemonset")
-
-		foundDs := &appsv1.DaemonSet{}
-		err = r.Client.Get(context.TODO(), types.NamespacedName{Name: ds.Name, Namespace: ds.Namespace}, foundDs)
-		if err != nil {
-			//The DaemonSet (DS) should be ideally created after the required SeLinux policy is installed on the
-			//node. One of the ways to ensure this is to check for the existence of "kata" runtimeclass before
-			//creating the DS
-			//Alternatively we can create the DS post execution of createRuntimeClass()
-			if k8serrors.IsNotFound(err) {
-				if contains(r.kataConfig.Status.RuntimeClass, "kata") {
-					r.Log.Info("Creating a new installation monitor daemonset", "ds.Namespace", ds.Namespace, "ds.Name", ds.Name)
-					err = r.Client.Create(context.TODO(), ds)
-					if err != nil {
-						r.Log.Error(err, "error when creating monitor daemonset")
-						res = ctrl.Result{Requeue: true, RequeueAfter: 15 * time.Second}
-					}
-				}
-			} else {
-				r.Log.Error(err, "could not get monitor daemonset, try again")
-				res = ctrl.Result{Requeue: true, RequeueAfter: 15 * time.Second}
-			}
-		} else {
-			r.Log.Info("Updating monitor daemonset", "ds.Namespace", ds.Namespace, "ds.Name", ds.Name)
-			err = r.Client.Update(context.TODO(), ds)
-			if err != nil {
-				r.Log.Error(err, "error when updating monitor daemonset")
-				res = ctrl.Result{Requeue: true, RequeueAfter: 15 * time.Second}
-			}
-		}
 		cMap := r.processDashboardConfigMap()
 		if cMap == nil {
 			r.Log.Info("failed to generate config map for metrics dashboard")
@@ -597,7 +561,7 @@ func (r *KataConfigOpenShiftReconciler) listKataPods() error {
 	}
 	for _, pod := range podList.Items {
 		if pod.Spec.RuntimeClassName != nil {
-			if contains(r.kataConfig.Status.RuntimeClass, *pod.Spec.RuntimeClassName) {
+			if contains(r.kataConfig.Status.RuntimeClasses, *pod.Spec.RuntimeClassName) {
 				return fmt.Errorf("Existing pods using \"%v\" RuntimeClass found. Please delete the pods manually for KataConfig deletion to proceed", *pod.Spec.RuntimeClassName)
 			}
 		}
@@ -756,8 +720,8 @@ func (r *KataConfigOpenShiftReconciler) createRuntimeClass(runtimeClassName stri
 		}
 	}
 
-	if !contains(r.kataConfig.Status.RuntimeClass, runtimeClassName) {
-		r.kataConfig.Status.RuntimeClass = append(r.kataConfig.Status.RuntimeClass, runtimeClassName)
+	if !contains(r.kataConfig.Status.RuntimeClasses, runtimeClassName) {
+		r.kataConfig.Status.RuntimeClasses = append(r.kataConfig.Status.RuntimeClasses, runtimeClassName)
 	}
 
 	return nil
@@ -1161,6 +1125,37 @@ func (r *KataConfigOpenShiftReconciler) processKataConfigInstallRequest() (ctrl.
 			return reconcile.Result{Requeue: true, RequeueAfter: 15 * time.Second}, err
 		}
 
+		ds := r.processDaemonsetForMonitor()
+		// Set KataConfig instance as the owner and controller
+		if err = controllerutil.SetControllerReference(r.kataConfig, ds, r.Scheme); err != nil {
+			r.Log.Error(err, "failed to set controller reference on the monitor daemonset")
+			return ctrl.Result{}, err
+		}
+		r.Log.Info("controller reference set for the monitor daemonset")
+
+		foundDs := &appsv1.DaemonSet{}
+		err = r.Client.Get(context.TODO(), types.NamespacedName{Name: ds.Name, Namespace: ds.Namespace}, foundDs)
+		if err != nil {
+			if k8serrors.IsNotFound(err) {
+				r.Log.Info("Creating a new installation monitor daemonset", "ds.Namespace", ds.Namespace, "ds.Name", ds.Name)
+				err = r.Client.Create(context.TODO(), ds)
+				if err != nil {
+					r.Log.Error(err, "error when creating monitor daemonset")
+					return ctrl.Result{Requeue: true, RequeueAfter: 15 * time.Second}, err
+				}
+			} else {
+				r.Log.Error(err, "could not get monitor daemonset, try again")
+				return ctrl.Result{Requeue: true, RequeueAfter: 15 * time.Second}, err
+			}
+		} else {
+			r.Log.Info("Updating monitor daemonset", "ds.Namespace", ds.Namespace, "ds.Name", ds.Name)
+			err = r.Client.Update(context.TODO(), ds)
+			if err != nil {
+				r.Log.Error(err, "error when updating monitor daemonset")
+				return ctrl.Result{Requeue: true, RequeueAfter: 15 * time.Second}, err
+			}
+		}
+
 		// create PeerPodConfig CRD and runtimeclass for peerpods
 		if r.kataConfig.Spec.EnablePeerPods {
 			err = r.enablePeerPodsMiscConfigs()
@@ -1672,10 +1667,6 @@ const (
 // will be returned.
 func (r *KataConfigOpenShiftReconciler) updateStatus() error {
 
-	if r.getInProgressConditionValue() != corev1.ConditionTrue {
-		return nil
-	}
-
 	err, nodeList := r.getNodes()
 	if err != nil {
 		return err