fix: resolves PR review comments, and refactorings

Author: nxtcoder17

operators/workspace/internal/controllers/workspace/controller.go

@@ -23,14 +23,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 )
 
-var (
-	PortConfig = templates.PortConfig{
-		SSHPort:        22,
-		TTYDPort:       56789,
-		NotebookPort:   56790,
-		CodeServerPort: 56791,
-	}
-)
+var PortConfig = templates.PortConfig{
+	SSHPort:        22,
+	TTYDPort:       56789,
+	NotebookPort:   56790,
+	CodeServerPort: 56791,
+}
 
 const (
 	IngressClassName = "nginx"
@@ -159,7 +157,7 @@ func (r *Reconciler) createDeployment(req *rApi.Request[*crdsv1.Workspace]) step
 		ImageCodeServer:  r.Env.WorkspaceImageCodeServer,
 
 		EnableVSCodeServer: obj.Spec.EnableVSCodeServer,
-		ImageVscodeServer:  r.Env.WorkspcaeImageVscodeServer,
+		ImageVscodeServer:  r.Env.WorkspaceImageVscodeServer,
 		PortConfig:         PortConfig,
 
 		ImagePullPolicy:     obj.Spec.ImagePullPolicy,

operators/workspace/internal/env/env.go

@@ -12,7 +12,7 @@ type Env struct {
 	WorkspaceImageTTYD            string `env:"WORKSPACE_IMAGE_TTYD" default:"ghcr.io/kloudlite/iac/ttyd:latest"`
 	WorkspaceImageJupyterNotebook string `env:"WORKSPACE_IMAGE_JUPYTER_NOTEBOOK" default:"ghcr.io/kloudlite/iac/jupyter:latest"`
 	WorkspaceImageCodeServer      string `env:"WORKSPACE_IMAGE_CODE_SERVER" default:"ghcr.io/kloudlite/iac/code-server:latest"`
-	WorkspcaeImageVscodeServer    string `env:"WORKSPCAE_IMAGE_VSCODE_SERVER" default:"ghcr.io/kloudlite/iac/vscode-server:latest"`
+	WorkspaceImageVscodeServer    string `env:"WORKSPACE_IMAGE_VSCODE_SERVER" default:"ghcr.io/kloudlite/iac/vscode-server:latest"`
 }
 
 func GetEnvOrDie() *Env {

toolkit/job-helper/job-runner.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 
 	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -43,15 +44,15 @@ func NewJobTracker(ctx context.Context, kcli client.Client, args JobTrackerArgs)
 
 func (jr *JobTracker) HasJobFinished() bool {
 	for _, v := range jr.job.Status.Conditions {
-		if v.Type == batchv1.JobComplete && v.Status == "True" {
+		if v.Type == batchv1.JobComplete && v.Status == corev1.ConditionTrue {
 			return true
 		}
 
-		if v.Type == batchv1.JobFailed && v.Status == "True" {
+		if v.Type == batchv1.JobFailed && v.Status == corev1.ConditionTrue {
 			return true
 		}
 
-		if v.Type == batchv1.JobSuspended && v.Status == "True" {
+		if v.Type == batchv1.JobSuspended && v.Status == corev1.ConditionTrue {
 			return true
 		}
 	}

toolkit/reconciler/event-predicate.go

@@ -76,7 +76,7 @@ func ReconcileFilter(eventRecorder ...record.EventRecorder) predicate.Funcs {
 			}
 
 			if len(oldObj.GetLabels()) != len(newObj.GetLabels()) || !reflect.DeepEqual(oldObj.GetLabels(), newObj.GetLabels()) {
-				fireEvent(newObj, ReasonLabelsUpdated, fmt.Sprintf("labels updated from (%+v) to (%+v)", newObj.GetLabels(), oldObj.GetLabels()))
+				fireEvent(newObj, ReasonLabelsUpdated, fmt.Sprintf("labels updated from (%+v) to (%+v)", oldObj.GetLabels(), newObj.GetLabels()))
 				return true
 			}
 
@@ -94,18 +94,18 @@ func ReconcileFilter(eventRecorder ...record.EventRecorder) predicate.Funcs {
 			}
 
 			if len(oldAnn) != len(newAnn) || annHasChanged {
-				fireEvent(newObj, ReasonAnnotationsUpdated, fmt.Sprintf("annotations updated from (%+v) to (%+v)", newObj.GetAnnotations(), oldObj.GetAnnotations()))
+				fireEvent(newObj, ReasonAnnotationsUpdated, fmt.Sprintf("annotations updated from (%+v) to (%+v)", oldObj.GetAnnotations(), newObj.GetAnnotations()))
 				return true
 			}
 
 			if len(oldObj.GetFinalizers()) != len(newObj.GetFinalizers()) || !reflect.DeepEqual(oldObj.GetFinalizers(), newObj.GetFinalizers()) {
-				fireEvent(newObj, ReasonFinalizersUpdated, fmt.Sprintf("finalizers updated from (%+v) to (%+v)", newObj.GetFinalizers(), oldObj.GetFinalizers()))
+				fireEvent(newObj, ReasonFinalizersUpdated, fmt.Sprintf("finalizers updated from (%+v) to (%+v)", oldObj.GetFinalizers(), newObj.GetFinalizers()))
 				return true
 			}
 
 			if len(oldObj.GetOwnerReferences()) != len(newObj.GetOwnerReferences()) ||
 				!reflect.DeepEqual(oldObj.GetOwnerReferences(), newObj.GetOwnerReferences()) {
-				fireEvent(newObj, ReasonOwnerReferencesUpdated, fmt.Sprintf("owner-references updated from (%+v) to (%+v)", newObj.GetOwnerReferences(), oldObj.GetOwnerReferences()))
+				fireEvent(newObj, ReasonOwnerReferencesUpdated, fmt.Sprintf("owner-references updated from (%+v) to (%+v)", oldObj.GetOwnerReferences(), newObj.GetOwnerReferences()))
 				return true
 			}
 
@@ -122,18 +122,18 @@ func ReconcileFilter(eventRecorder ...record.EventRecorder) predicate.Funcs {
 			}
 
 			if *oldRes.Status.IsReady != *newRes.Status.IsReady {
-				fireEvent(newObj, ReasonStatusIsReadyChanged, fmt.Sprintf("resource isReady changed from (%v) to (%v)", *newRes.Status.IsReady, *oldRes.Status.IsReady))
+				fireEvent(newObj, ReasonStatusIsReadyChanged, fmt.Sprintf("resource isReady changed from (%v) to (%v)", *oldRes.Status.IsReady, *newRes.Status.IsReady))
 				return true
 			}
 
 			if len(oldRes.Status.Checks) != len(newRes.Status.Checks) {
-				fireEvent(newObj, ReasonStatusChecksUpdated, fmt.Sprintf("resource status.checks changed from (%+v) to (%+v)", newRes.Status.Checks, oldRes.Status.Checks))
+				fireEvent(newObj, ReasonStatusChecksUpdated, fmt.Sprintf("resource status.checks changed from (%+v) to (%+v)", oldRes.Status.Checks, newRes.Status.Checks))
 				return true
 			}
 
 			for k, v := range oldRes.Status.Checks {
 				if !AreChecksEqual(newRes.Status.Checks[k], v) {
-					fireEvent(newObj, ReasonStatusChecksUpdated, fmt.Sprintf("resource status.checks changed from (%+v) to (%+v)", newRes.Status.Checks, oldRes.Status.Checks))
+					fireEvent(newObj, ReasonStatusChecksUpdated, fmt.Sprintf("resource status.checks changed from (%+v) to (%+v)", oldRes.Status.Checks, newRes.Status.Checks))
 					return true
 				}
 			}