Skip to content

fix: helm and gitOps pipeline feature gap changes #2891

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 11 commits into from
Jan 25, 2023
Merged

fix: helm and gitOps pipeline feature gap changes #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9da6689
wip
kartik-579 Jan 24, 2023
4aaa957
wip
kartik-579 Jan 24, 2023
a263a5d
wip
kartik-579 Jan 24, 2023
3dfa8e8
added safety check
kartik-579 Jan 24, 2023
7a149a8
wip
kartik-579 Jan 24, 2023
17c7d84
grpc change
kartik-579 Jan 24, 2023
8f4ec57
removed redundant method call and improved logic for updating helm pi…
kartik-579 Jan 24, 2023
8decb5d
bulk hibernate api support for helm pipelines
kartik-579 Jan 24, 2023
73af87a
bulk hibernate/un-hibernate support for helm pipelines
kartik-579 Jan 24, 2023
ff202cd
Merge branch 'main' into helm-pipeline-status-changes
kartik-579 Jan 24, 2023
89de7dd
review changes
kartik-579 Jan 25, 2023
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
26 changes: 26 additions & 0 deletions api/helm-app/HelmAppService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const DEFAULT_CLUSTER_ID = 1
type HelmAppService interface {
ListHelmApplications(ctx context.Context, clusterIds []int, w http.ResponseWriter, token string, helmAuth func(token string, object string) bool)
GetApplicationDetail(ctx context.Context, app *AppIdentifier) (*AppDetail, error)
GetApplicationStatus(ctx context.Context, app *AppIdentifier) (string, error)
GetApplicationDetailWithFilter(ctx context.Context, app *AppIdentifier, resourceTreeFilter *ResourceTreeFilter) (*AppDetail, error)
HibernateApplication(ctx context.Context, app *AppIdentifier, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error)
UnHibernateApplication(ctx context.Context, app *AppIdentifier, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error)
Expand Down Expand Up @@ -250,6 +251,10 @@ func (impl *HelmAppServiceImpl) GetApplicationDetail(ctx context.Context, app *A
return impl.getApplicationDetail(ctx, app, nil)
}

func (impl *HelmAppServiceImpl) GetApplicationStatus(ctx context.Context, app *AppIdentifier) (string, error) {
return impl.getApplicationStatus(ctx, app)
}

func (impl *HelmAppServiceImpl) GetApplicationDetailWithFilter(ctx context.Context, app *AppIdentifier, resourceTreeFilter *ResourceTreeFilter) (*AppDetail, error) {
return impl.getApplicationDetail(ctx, app, resourceTreeFilter)
}
Expand Down Expand Up @@ -290,6 +295,27 @@ func (impl *HelmAppServiceImpl) getApplicationDetail(ctx context.Context, app *A
return appdetail, err
}

func (impl *HelmAppServiceImpl) getApplicationStatus(ctx context.Context, app *AppIdentifier) (string, error) {
applicationStatus := ""
config, err := impl.GetClusterConf(app.ClusterId)
if err != nil {
impl.logger.Errorw("error in fetching cluster detail", "err", err)
return applicationStatus, err
}
req := &AppDetailRequest{
ClusterConfig: config,
Namespace: app.Namespace,
ReleaseName: app.ReleaseName,
}
appStatus, err := impl.helmAppClient.GetAppStatus(ctx, req)
if err != nil {
impl.logger.Errorw("error in fetching app status", "err", err)
return applicationStatus, err
}
applicationStatus = appStatus.ApplicationStatus
return applicationStatus, err
}

func (impl *HelmAppServiceImpl) GetDeploymentHistory(ctx context.Context, app *AppIdentifier) (*HelmAppDeploymentHistory, error) {
config, err := impl.GetClusterConf(app.ClusterId)
if err != nil {
Expand Down
13 changes: 13 additions & 0 deletions api/helm-app/applicationClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
type HelmAppClient interface {
ListApplication(ctx context.Context, req *AppListRequest) (ApplicationService_ListApplicationsClient, error)
GetAppDetail(ctx context.Context, in *AppDetailRequest) (*AppDetail, error)
GetAppStatus(ctx context.Context, in *AppDetailRequest) (*AppStatus, error)
Hibernate(ctx context.Context, in *HibernateRequest) (*HibernateResponse, error)
UnHibernate(ctx context.Context, in *HibernateRequest) (*HibernateResponse, error)
GetDeploymentHistory(ctx context.Context, in *AppDetailRequest) (*HelmAppDeploymentHistory, error)
Expand Down Expand Up @@ -110,6 +111,18 @@ func (impl *HelmAppClientImpl) GetAppDetail(ctx context.Context, in *AppDetailRe
return detail, nil
}

func (impl *HelmAppClientImpl) GetAppStatus(ctx context.Context, in *AppDetailRequest) (*AppStatus, error) {
applicationClient, err := impl.getApplicationClient()
if err != nil {
return nil, err
}
appStatus, err := applicationClient.GetAppStatus(ctx, in)
if err != nil {
return nil, err
}
return appStatus, nil
}

func (impl *HelmAppClientImpl) Hibernate(ctx context.Context, in *HibernateRequest) (*HibernateResponse, error) {
applicationClient, err := impl.getApplicationClient()
if err != nil {
Expand Down
Loading