From 3b0919b158bdfa0f2932bb04724443026c1a6a3e Mon Sep 17 00:00:00 2001 From: Shane Bryzak Date: Fri, 15 Mar 2024 10:44:58 +1000 Subject: [PATCH] modified type --- api/v1alpha1/usersignup_types.go | 5 +++-- api/v1alpha1/zz_generated.deepcopy.go | 1 + api/v1alpha1/zz_generated.openapi.go | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/api/v1alpha1/usersignup_types.go b/api/v1alpha1/usersignup_types.go index 7df90091..1c886334 100644 --- a/api/v1alpha1/usersignup_types.go +++ b/api/v1alpha1/usersignup_types.go @@ -248,11 +248,12 @@ type UserSignupStatus struct { // +optional HomeSpace string `json:"homeSpace,omitempty"` - // DeactivationTimestamp is the calculated timestamp after which the user's account will be deactivated, typically + // 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. - DeactivationTimestamp string `json:"deactivationTimestamp,omitempty"` + // +optional + ScheduledDeactivationTimestamp metav1.Time `json:"deactivationTimestamp,omitempty"` } //+kubebuilder:object:root=true diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 56272c8f..b5858a64 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -3728,6 +3728,7 @@ func (in *UserSignupStatus) DeepCopyInto(out *UserSignupStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + in.ScheduledDeactivationTimestamp.DeepCopyInto(&out.ScheduledDeactivationTimestamp) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserSignupStatus. diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index 669abd88..bb51d410 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -5177,16 +5177,16 @@ func schema_codeready_toolchain_api_api_v1alpha1_UserSignupStatus(ref common.Ref }, "deactivationTimestamp": { SchemaProps: spec.SchemaProps{ - Description: "DeactivationTimestamp 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.", - Type: []string{"string"}, - Format: "", + Description: "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.", + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, }, }, }, Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.Condition"}, + "github.com/codeready-toolchain/api/api/v1alpha1.Condition", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } }