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

Jump to bottom

Fix app live resource lister wrong attribute #4072

Merged
merged 2 commits into from
Dec 13, 2022
Merged

Fix app live resource lister wrong attribute #4072

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
f610b60
Fix app live resource lister wrong attribute
khanhtc1202 Dec 13, 2022
f319e4d
Merge branch 'master' into fix-app-live
nghialv Dec 13, 2022
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
8 changes: 4 additions & 4 deletions pkg/app/piped/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,13 +719,13 @@ func (c *controller) cancelDeployment(ctx context.Context, d *model.Deployment,
}

type appLiveResourceLister struct {
lister liveResourceLister
cloudProvider string
appID string
lister liveResourceLister
platformProvider string
appID string
}

func (l appLiveResourceLister) ListKubernetesResources() ([]provider.Manifest, bool) {
return l.lister.ListKubernetesAppLiveResources(l.cloudProvider, l.appID)
return l.lister.ListKubernetesAppLiveResources(l.platformProvider, l.appID)
}

func reportApplicationDeployingStatus(ctx context.Context, c apiClient, appID string, deploying bool) error {
Expand Down
6 changes: 3 additions & 3 deletions pkg/app/piped/controller/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,9 +477,9 @@ func (s *scheduler) executeStage(sig executor.StopSignal, ps model.PipelineStage
stageID: ps.Id,
}
alrLister := appLiveResourceLister{
lister: s.liveResourceLister,
cloudProvider: app.CloudProvider,
appID: app.Id,
lister: s.liveResourceLister,
platformProvider: app.PlatformProvider,
appID: app.Id,
}
aStore := appAnalysisResultStore{
store: s.analysisResultStore,
Expand Down