Skip to content

feat: logs prev container #3469

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 4 commits into from
Jun 13, 2023
Merged

feat: logs prev container #3469

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6881c51
minor-change
rish2320 Jun 1, 2023
386ac65
conditional break fixed
rish2320 Jun 1, 2023
76563d4
main merge and pull
rish2320 Jun 2, 2023
94a9f10
changing names
rish2320 Jun 7, 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
10 changes: 6 additions & 4 deletions client/k8s/application/Application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ type K8sRequestBean struct {
}

type PodLogsRequest struct {
SinceTime *metav1.Time `json:"sinceTime,omitempty"`
TailLines int `json:"tailLines"`
Follow bool `json:"follow"`
ContainerName string `json:"containerName"`
SinceTime *metav1.Time `json:"sinceTime,omitempty"`
TailLines int `json:"tailLines"`
Follow bool `json:"follow"`
ContainerName string `json:"containerName"`
PrevContainerLogs bool `json:"previous"`
Copy link
Contributor

@prakash100198 prakash100198 Jun 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By looking at variable name it does not strike as boolean value, please name it appropriately. maybe isPrevContainerLogsEnabled or any other name like this.

Copy link
Contributor Author

@rish2320 rish2320 Jun 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

}

type ResourceIdentifier struct {
Expand Down Expand Up @@ -236,6 +237,7 @@ func (impl K8sClientServiceImpl) GetPodLogs(ctx context.Context, restConfig *res
TailLines: &tailLines,
Container: podLogsRequest.ContainerName,
Timestamps: true,
Previous: podLogsRequest.PrevContainerLogs,
}
if podLogsRequest.SinceTime != nil {
podLogOptions.SinceTime = podLogsRequest.SinceTime
Expand Down
2 changes: 0 additions & 2 deletions pkg/pipeline/CiCdPipelineOrchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,8 +1176,6 @@ func (impl CiCdPipelineOrchestratorImpl) CreateCDPipelines(pipelineRequest *bean
return 0, err
}



env, err := impl.envRepository.FindById(pipelineRequest.EnvironmentId)
if err != nil {
impl.logger.Errorw("error in getting environment by id", "err", err)
Expand Down
2 changes: 1 addition & 1 deletion util/ValidatorHelper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func AutoScale(dat map[string]interface{}) (bool, error) {
if dat["kedaAutoscaling"] != nil {
kedaAutoScale, ok := dat["kedaAutoscaling"].(map[string]interface{})["enabled"]
if ok {
kedaAutoScaleEnabled=kedaAutoScale.(bool)
kedaAutoScaleEnabled = kedaAutoScale.(bool)
}
}
if dat["autoscaling"] != nil {
Expand Down
12 changes: 9 additions & 3 deletions util/k8s/k8sApplicationService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ func (impl *K8sApplicationServiceImpl) ValidatePodLogsRequestQuery(r *http.Reque
sinceSeconds = 0
}*/
containerName, clusterIdString := v.Get("containerName"), v.Get("clusterId")
prevContainerLogs := v.Get("previous")
isPrevLogs, err := strconv.ParseBool(prevContainerLogs)
if err != nil {
isPrevLogs = false
}
appId := v.Get("appId")
follow, err := strconv.ParseBool(v.Get("follow"))
if err != nil {
Expand All @@ -165,9 +170,10 @@ func (impl *K8sApplicationServiceImpl) ValidatePodLogsRequestQuery(r *http.Reque
},
PodLogsRequest: application.PodLogsRequest{
//SinceTime: sinceSeconds,
TailLines: tailLines,
Follow: follow,
ContainerName: containerName,
TailLines: tailLines,
Follow: follow,
ContainerName: containerName,
PrevContainerLogs: isPrevLogs,
Copy link
Contributor

@prakash100198 prakash100198 Jun 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change here accordingly

Copy link
Contributor Author

@rish2320 rish2320 Jun 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

},
}
request.K8sRequest = k8sRequest
Expand Down