Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a61db98
Add basic skeleton for improvements
Mar 15, 2018
94176ba
Update protobuf config for repository API
Mar 16, 2018
5b625d4
Update skeleton of deploy params code
Mar 16, 2018
fe66571
Add DeploymentInfo struct
Mar 16, 2018
606fd13
Add comment, comment out code
Mar 16, 2018
18dbd9f
Update repository.pb.go
Mar 16, 2018
bdc7a2e
Update comment in repository.proto
Mar 16, 2018
253e65d
Update reposerver subpackage
Mar 16, 2018
94348a6
Comment out for now
Mar 16, 2018
0339674
Start getting function into shape
Mar 16, 2018
a100fb7
Flesh out logic further
Mar 16, 2018
15da5e1
Get unit test started for TestListEnvParams
Mar 16, 2018
3ec6340
Add missing interface declaration
Mar 16, 2018
a4491be
Finish unit test for ListEnvParams
Mar 16, 2018
3a9c380
Use string literals for regexp.MustCompile
Mar 16, 2018
08a4e82
Clean up RPC response code
Mar 16, 2018
428a56d
Use map[string]interface{} for now, thanks @alexmt
Mar 16, 2018
3a90924
First draft attempt to integrate deployment info retrieval
Mar 16, 2018
f4e0b84
Install more wiring
Mar 16, 2018
eba2122
DRY
Mar 16, 2018
b15ebb3
Move CRD update to after successful deployment, thanks @alexmt
Mar 16, 2018
0895d06
Move app params update to after successful deployment, too
Mar 16, 2018
094a3c8
Don't replace application status, thanks @alexmt
Mar 16, 2018
a0451ad
Convert to string types
Mar 16, 2018
9a7b714
Don't create unused var
Mar 16, 2018
9445dba
Log received values
Mar 16, 2018
09bd414
Unquote quoted params
Mar 16, 2018
08e3871
Use string as value type
Mar 16, 2018
14e1b43
Use named returns, no magic number
Mar 16, 2018
7e8d2c4
Use map for gRPC data transfer
Mar 16, 2018
015e197
Update generated code
Mar 16, 2018
73c4a21
Log actual map, not wrapper object
Mar 16, 2018
a41dec1
Fix unit test
Mar 16, 2018
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
15 changes: 7 additions & 8 deletions controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,15 @@ func (ctrl *ApplicationController) processNextItem() bool {
updatedApp := app.DeepCopy()
status, err := ctrl.tryRefreshAppStatus(updatedApp)
if err != nil {
status = &appv1.ApplicationStatus{
ComparisonResult: appv1.ComparisonResult{
Status: appv1.ComparisonStatusError,
Error: fmt.Sprintf("Failed to get application status for application '%s': %v", app.Name, err),
ComparedTo: app.Spec.Source,
ComparedAt: metav1.Time{Time: time.Now().UTC()},
},
updatedApp.Status.ComparisonResult = appv1.ComparisonResult{
Status: appv1.ComparisonStatusError,
Error: fmt.Sprintf("Failed to get application status for application '%s': %v", app.Name, err),
ComparedTo: app.Spec.Source,
ComparedAt: metav1.Time{Time: time.Now().UTC()},
}
} else {
updatedApp.Status = *status
}
updatedApp.Status = *status
ctrl.persistApp(updatedApp)
}

Expand Down
Loading