Add some logging to sandbox-operator

StackVista · Jan 26, 2021 · 1b23f53 · 1b23f53
1 parent f33edfa
commit 1b23f53
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/apis/devops/v1/sandbox_types.go b/apis/devops/v1/sandbox_types.go
@@ -43,8 +43,8 @@ type SandboxSpec struct {
 
 // SandboxStatus defines the observed state of Sandbox
 type SandboxStatus struct {
-	NamespaceStatus  *v1.NamespaceStatus `json:",omitempty"`
-	LastNotification *metav1.Time        `json:"last_notification,omitempty"`
+	NamespaceStatus  v1.NamespaceStatus `json:",omitempty"`
+	LastNotification *metav1.Time       `json:"last_notification,omitempty"`
 
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file

diff --git a/apis/devops/v1/zz_generated.deepcopy.go b/apis/devops/v1/zz_generated.deepcopy.go
diff --git a/controllers/devops/sandbox_controller.go b/controllers/devops/sandbox_controller.go
@@ -91,15 +91,20 @@ func (r *SandboxReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 			return ctrl.Result{}, err
 		}
 
-		sandbox.Status.NamespaceStatus = &newNs.Status
+		log.WithValues("status.phase", newNs.Status.Phase).Info("Created namespace is now...")
+
+		sandbox.Status.NamespaceStatus = newNs.Status
 		if err := r.Status().Update(ctx, sandbox); err != nil {
+			log.Error(err, "Unable to update sandbox status")
 			return ctrl.Result{}, err
 		}
 	} else {
-		if sandbox.Status.NamespaceStatus != nil && sandbox.Status.NamespaceStatus.Phase == v1.NamespaceActive {
+		if sandbox.Status.NamespaceStatus.Phase == v1.NamespaceActive {
 			return ctrl.Result{}, nil
 		}
 
+		log.WithValues("status.phase", sandbox.Status.NamespaceStatus.Phase).Info("Namespace exists, but sandbox status is not Active")
+
 		return ctrl.Result{}, fmt.Errorf("Namespace for sandbox already exists")
 	}