Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

To add reconciliation time stamps #572

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

To add reconciliation time stamps #572

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
74c87c4
Added time stamps and unmarshalled the json to store the current time…
Abiji-2020 Sep 14, 2024
62b82b0
Update module_types.go
Abiji-2020 Sep 16, 2024
3112b32
Improved some minor changes and added verified teh build of the modul…
Abiji-2020 Sep 16, 2024
c025b98
Formatted the code and added optional for the FinishedAt struct values
Abiji-2020 Sep 17, 2024
7c40271
formatted the code
Abiji-2020 Sep 17, 2024
4c1d46b
Update cyclops-ui.com_modules.yaml
Abiji-2020 Sep 17, 2024
d8664bf
Merge branch 'cyclops-ui:main' into main
Abiji-2020 Sep 18, 2024
eaf932d
Added kubebuilderComment
Abiji-2020 Sep 18, 2024
f015da6
make manifests
petar-cvit Sep 21, 2024
b44748f
Merge branch 'cyclops-ui:main' into main
Abiji-2020 Sep 24, 2024
7edac80
Merge branch 'cyclops-ui:main' into main
Abiji-2020 Sep 26, 2024
069feba
Merge branch 'cyclops-ui:main' into main
Abiji-2020 Sep 29, 2024
caf4b91
Merge branch 'cyclops-ui:main' into main
Abiji-2020 Sep 30, 2024
0663ee0
Merge branch 'cyclops-ui:main' into main
Abiji-2020 Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cyclops-ctrl/api/v1alpha1/module_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ type ReconciliationStatus struct {
// +kubebuilder:validation:Optional
Reason string `json:"reason,omitempty"`
// +kubebuilder:validation:Optional
Errors []string `json:"errors"`
Errors []string `json:"errors"`
FinishedAt string `json:"finishedAt,omitempty"`
Abiji-2020 marked this conversation as resolved.
Show resolved Hide resolved
}

type GroupVersionResource struct {
Expand Down Expand Up @@ -94,6 +95,7 @@ type HistoryEntry struct {
Generation int64 `json:"generation"`
TemplateRef HistoryTemplateRef `json:"template"`
Values apiextensionsv1.JSON `json:"values"`
FinishedAt string `json:"finishedAt,omitempty"`
}

//+kubebuilder:object:root=true
Expand Down
6 changes: 5 additions & 1 deletion cyclops-ctrl/config/crd/bases/cyclops-ui.com_modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ spec:
history:
items:
properties:
finishedAt:
type: string
generation:
format: int64
type: integer
Expand Down Expand Up @@ -113,6 +115,8 @@ spec:
items:
type: string
type: array
finishedAt:
type: string
reason:
type: string
status:
Expand All @@ -122,7 +126,7 @@ spec:
- succeeded
- failed
type: string
type: object
required:
templateResolvedVersion:
type: string
required:
Expand Down
7 changes: 4 additions & 3 deletions cyclops-ctrl/internal/modulecontroller/module_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,10 @@ func (r *ModuleReconciler) setStatus(

module.Status = cyclopsv1alpha1.ModuleStatus{
ReconciliationStatus: cyclopsv1alpha1.ReconciliationStatus{
Status: status,
Reason: reason,
Errors: installErrors,
Status: status,
Reason: reason,
Errors: installErrors,
FinishedAt: time.Now().Format(time.RFC3339), // Convert time to string format
},
ManagedGVRs: r.mergeChildrenGVRs(module.Status.ManagedGVRs, childrenResources),
TemplateResolvedVersion: templateResolvedVersion,
Expand Down