8000 fix(controller): only update lastTransitionTime when needed by crenshaw-dev · Pull Request #23018 · argoproj/argo-cd · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(controller): only update lastTransitionTime when needed #23018

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

Merged
merged 2 commits into from
May 20, 2025
Merged

fix(controller): only update lastTransitionTime when needed #23018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8233906
fix(controller): only update lastTransitionTime when needed
crenshaw-dev May 16, 2025
d190760
deprecate fields, rename for simplicity
crenshaw-dev May 19, 2025
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
93 changes: 42 additions & 51 deletions applicationset/controllers/applicationset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3887,7 +3887,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -3903,7 +3903,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app2",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -3965,7 +3965,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -3981,7 +3981,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app2",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4043,7 +4043,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -4059,7 +4059,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app2",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4121,7 +4121,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusDegraded,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -4137,7 +4137,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app2",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusDegraded,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4203,7 +4203,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -4219,7 +4219,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app2",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4293,7 +4293,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -4309,7 +4309,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app2",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -4325,7 +4325,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app3",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -4341,7 +4341,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app5",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand All @@ -4357,7 +4357,7 @@ func TestBuildAppSyncMap(t *testing.T) {
Name: "app6",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusDegraded,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4475,7 +4475,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4530,7 +4530,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4594,7 +4594,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4745,7 +4745,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusProgressing,
},
Sync: v1alpha1.SyncStatus{
Expand Down Expand Up @@ -4807,7 +4807,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4873,7 +4873,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4939,7 +4939,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -4994,7 +4994,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -5067,7 +5067,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusDegraded,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -5148,7 +5148,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusDegraded,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -5233,7 +5233,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -5299,7 +5299,7 @@ func TestUpdateApplicationSetApplicationStatus(t *testing.T) {
Name: "app1",
},
Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
OperationState: &v1alpha1.OperationState{
Expand Down Expand Up @@ -6155,9 +6155,8 @@ func TestUpdateResourceStatus(t *testing.T) {
Sync: v1alpha1.SyncStatus{
Status: v1alpha1.SyncStatusCodeSynced,
},
Health: v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
},
},
Expand All @@ -6167,8 +6166,7 @@ func TestUpdateResourceStatus(t *testing.T) {
Name: "app1",
Status: v1alpha1.SyncStatusCodeSynced,
Health: &v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Status: health.HealthStatusHealthy,
},
},
},
Expand All @@ -6186,8 +6184,7 @@ func TestUpdateResourceStatus(t *testing.T) {
Name: "app1",
Status: v1alpha1.SyncStatusCodeSynced,
Health: &v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Status: health.HealthStatusHealthy,
},
},
},
Expand All @@ -6202,9 +6199,8 @@ func TestUpdateResourceStatus(t *testing.T) {
Sync: v1alpha1.SyncStatus{
Status: v1alpha1.SyncStatusCodeSynced,
},
Health: v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
},
},
Expand All @@ -6214,8 +6210,7 @@ func TestUpdateResourceStatus(t *testing.T) {
Name: "app1",
Status: v1alpha1.SyncStatusCodeSynced,
Health: &v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Status: health.HealthStatusHealthy,
},
},
},
Expand Down Expand Up @@ -6249,9 +6244,8 @@ func TestUpdateResourceStatus(t *testing.T) {
Sync: v1alpha1.SyncStatus{
Status: v1alpha1.SyncStatusCodeSynced,
},
Health: v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
},
},
Expand All @@ -6261,8 +6255,7 @@ func TestUpdateResourceStatus(t *testing.T) {
Name: "app1",
Status: v1alpha1.SyncStatusCodeSynced,
Health: &v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Status: health.HealthStatusHealthy,
},
},
},
Expand Down Expand Up @@ -6324,8 +6317,7 @@ func generateNAppResourceStatuses(n int) []v1alpha1.ResourceStatus {
Name: "app" + strconv.Itoa(i),
Status: v1alpha1.SyncStatusCodeSynced,
Health: &v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Status: health.HealthStatusHealthy,
},
},
)
Expand All @@ -6344,9 +6336,8 @@ func generateNHealthyApps(n int) []v1alpha1.Application {
Sync: v1alpha1.SyncStatus{
Status: v1alpha1.SyncStatusCodeSynced,
},
Health: v1alpha1.HealthStatus{
Status: health.HealthStatusHealthy,
Message: "OK",
Health: v1alpha1.AppHealthStatus{
Status: health.HealthStatusHealthy,
},
},
})
Expand Down Expand Up @@ -6450,12 +6441,12 @@ func TestApplicationOwnsHandler(t *testing.T) {
{name: "ApplicationHealthStatusDiff", args: args{
e: event.UpdateEvent{
ObjectOld: &v1alpha1.Application{Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: "Unknown",
},
}},
ObjectNew: &v1alpha1.Application{Status: v1alpha1.ApplicationStatus{
Health: v1alpha1.HealthStatus{
Health: v1alpha1.AppHealthStatus{
Status: "Healthy",
},
}},
Expand Down
2 changes: 1 addition & 1 deletion applicationset/status/resource_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func BuildResourceStatus(statusMap map[string]argov1alpha1.ResourceStatus, apps
status.Name = app.Name
status.Namespace = app.Namespace
status.Status = app.Status.Sync.Status
status.Health = app.Status.Health.DeepCopy()
status.Health = &argov1alpha1.HealthStatus{Status: app.Status.Health.Status}

statusMap[app.Name] = status
}
Expand Down
Loading
Loading
294C
0