Add field to tell if a workload is deleted (#104)

* Add field to tell if a workload is deleted

This state is usually temporary and should be resolved within minutes

Fixes #64

* add the field to job as well

* DeletedAt -> DeletionStartedAt

Author: thokra-nav

data/k8s/dev/devteam/no-logs-for-you.yaml

@@ -6,6 +6,7 @@ metadata:
     nais.io/deploymentCorrelationID: f8c04f82-6a84-4a8e-9f8b-563b5894d0cf
     nais.io/skipDeploymentMessage: "true"
   creationTimestamp: "2023-01-20T10:51:47Z"
+  deletionTimestamp: "2023-01-20T10:51:47Z"
   finalizers:
     - naiserator.nais.io/finalizer
   generation: 407981

internal/graph/gengql/generated.go

@@ -167,6 +167,11 @@ type Application implements Node & Workload {
 		"""
 		before: Cursor
 	): ApplicationInstanceConnection!
+
+	"""
+	If set, when the application was marked for deletion.
+	"""
+	deletionStartedAt: Time
 }
 
 """

internal/graph/schema/applications.graphqls

@@ -96,6 +96,11 @@ type Job implements Node & Workload {
 
 	"The job manifest."
 	manifest: JobManifest!
+
+	"""
+	If set, when the job was marked for deletion.
+	"""
+	deletionStartedAt: Time
 }
 
 type JobManifest implements WorkloadManifest {

internal/graph/schema/jobs.graphqls

@@ -85,6 +85,11 @@ interface Workload implements Node {
 	The workload manifest.
 	"""
 	manifest: WorkloadManifest!
+
+	"""
+	If set, when the workload was marked for deletion.
+	"""
+	deletionStartedAt: Time
 }
 
 """

internal/graph/schema/workloads.graphqls

@@ -18,6 +18,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 )
 
 type (
@@ -302,9 +303,15 @@ func toGraphApplication(application *nais_io_v1alpha1.Application, environmentNa
 		logging = application.Spec.Observability.Logging
 	}
 
+	var deletedAt *time.Time
+	if application.DeletionTimestamp != nil {
+		deletedAt = ptr.To(application.DeletionTimestamp.Time)
+	}
+
 	return &Application{
 		Base: workload.Base{
 			Name:                application.Name,
+			DeletionStartedAt:   deletedAt,
 			EnvironmentName:     environmentName,
 			TeamSlug:            slug.Slug(application.Namespace),
 			ImageString:         application.Spec.Image,

internal/workload/application/models.go

@@ -327,9 +327,15 @@ func toGraphJob(job *nais_io_v1.Naisjob, environmentName string) *Job {
 		logging = job.Spec.Observability.Logging
 	}
 
+	var deletedAt *time.Time
+	if job.DeletionTimestamp != nil {
+		deletedAt = ptr.To(job.DeletionTimestamp.Time)
+	}
+
 	return &Job{
 		Base: workload.Base{
 			Name:                job.Name,
+			DeletionStartedAt:   deletedAt,
 			EnvironmentName:     environmentName,
 			TeamSlug:            slug.Slug(job.Namespace),
 			ImageString:         job.Spec.Image,

internal/workload/job/models.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/nais/api/internal/graph/ident"
 	"github.com/nais/api/internal/graph/model"
@@ -49,6 +50,7 @@ type Base struct {
 	RolloutCompleteTime int64                    `json:"-"`
 	Type                Type                     `json:"-"`
 	Logging             *nais_io_v1.Logging      `json:"-"`
+	DeletionStartedAt   *time.Time               `json:"deletedAt"`
 }
 
 func (b Base) Image() *ContainerImage {