From 1711827243fef9c283419fe21691939cbc31feab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:57:26 -0500 Subject: [PATCH] sync: update external libs (#923) Co-authored-by: kononovn <10511306+kononovn@users.noreply.github.com> --- .../v1alpha1/clusterinstance_conditions.go | 1 + .../v1alpha1/clusterinstance_types.go | 23 +++++++++++++++++-- .../v1alpha1/zz_generated.deepcopy.go | 9 ++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/pkg/schemes/siteconfig/v1alpha1/clusterinstance_conditions.go b/pkg/schemes/siteconfig/v1alpha1/clusterinstance_conditions.go index 7c20133b3..ceac0b566 100644 --- a/pkg/schemes/siteconfig/v1alpha1/clusterinstance_conditions.go +++ b/pkg/schemes/siteconfig/v1alpha1/clusterinstance_conditions.go @@ -44,6 +44,7 @@ const ( // The following constants define the different reasons that conditions will be set for const ( + Initialized ClusterInstanceConditionReason = "Initialized" Completed ClusterInstanceConditionReason = "Completed" Failed ClusterInstanceConditionReason = "Failed" TimedOut ClusterInstanceConditionReason = "TimedOut" diff --git a/pkg/schemes/siteconfig/v1alpha1/clusterinstance_types.go b/pkg/schemes/siteconfig/v1alpha1/clusterinstance_types.go index 46cb081a9..135fd1213 100644 --- a/pkg/schemes/siteconfig/v1alpha1/clusterinstance_types.go +++ b/pkg/schemes/siteconfig/v1alpha1/clusterinstance_types.go @@ -494,11 +494,30 @@ type ReinstallHistory struct { // ReinstallStatus represents the current state and historical details of reinstall operations for a ClusterInstance. type ReinstallStatus struct { + + // List of conditions pertaining to reinstall requests. + // +optional + Conditions []metav1.Condition `json:"conditions,omitempty"` + + // InProgressGeneration is the generation of the ClusterInstance that is being processed for reinstallation. + // It corresponds to the Generation field in ReinstallSpec and indicates the latest reinstall request that + // the controller is acting upon. + // +optional + InProgressGeneration string `json:"inProgressGeneration,omitempty"` + // ObservedGeneration is the generation of the ClusterInstance that has been processed for reinstallation. // It corresponds to the Generation field in ReinstallSpec and indicates the latest reinstall request that // the controller has acted upon. - // +required - ObservedGeneration string `json:"observedGeneration"` + // +optionsl + ObservedGeneration string `json:"observedGeneration,omitempty"` + + // RequestStartTime indicates the time at which SiteConfig was requested to reinstall. + // +optional + RequestStartTime metav1.Time `json:"requestStartTime,omitempty"` + + // RequestEndTime indicates the time at which SiteConfig completed processing the reinstall request. + // +optional + RequestEndTime metav1.Time `json:"requestEndTime,omitempty"` // History maintains a record of all previous reinstallation attempts. // Each entry captures details such as the generation, timestamp, and the differences in the ClusterInstance diff --git a/pkg/schemes/siteconfig/v1alpha1/zz_generated.deepcopy.go b/pkg/schemes/siteconfig/v1alpha1/zz_generated.deepcopy.go index 7a6bd2a09..5093d467c 100644 --- a/pkg/schemes/siteconfig/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/schemes/siteconfig/v1alpha1/zz_generated.deepcopy.go @@ -467,6 +467,15 @@ func (in *ReinstallSpec) DeepCopy() *ReinstallSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ReinstallStatus) DeepCopyInto(out *ReinstallStatus) { *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]metav1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + in.RequestStartTime.DeepCopyInto(&out.RequestStartTime) + in.RequestEndTime.DeepCopyInto(&out.RequestEndTime) if in.History != nil { in, out := &in.History, &out.History *out = make([]ReinstallHistory, len(*in))