Merge branch 'master' into make-go

codeready-toolchain · Mar 18, 2024 · 6cea068 · 6cea068
2 parents d381518 + d61ff49
commit 6cea068
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/api/v1alpha1/usersignup_types.go b/api/v1alpha1/usersignup_types.go
@@ -247,6 +247,13 @@ type UserSignupStatus struct {
 	// This is used by the proxy when no workspace context is provided.
 	// +optional
 	HomeSpace string `json:"homeSpace,omitempty"`
+
+	// ScheduledDeactivationTimestamp is the calculated timestamp after which the user's account will be deactivated, typically
+	// after the expiry of their trial and based on the term specific by their UserTier.  This property may be used as
+	// a convenience to determine the amount of time an account has left before deactivation, without requiring a separate
+	// lookup for the UserTier and subsequent calculation.  It is managed by the Deactivation controller in the host operator.
+	// +optional
+	ScheduledDeactivationTimestamp metav1.Time `json:"scheduledDeactivationTimestamp,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go