Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9f8cee4
argocd rbac policy enforcement for kubelink
Ash-exp Mar 28, 2023
0cde2a5
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp Apr 3, 2023
c6577f9
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp May 8, 2023
275177a
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp May 8, 2023
48653b4
updated rbac for k8s resource
Ash-exp May 8, 2023
1e5297a
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp May 8, 2023
74610da
updated terminal rbac policy for helm app
Ash-exp May 9, 2023
51106c6
removed deployment type
Ash-exp May 9, 2023
7c972f9
Updated TODO & ResourceValidation for devtron app
Ash-exp May 10, 2023
8c55d66
updated TODO
Ash-exp May 10, 2023
f528de2
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp May 10, 2023
1b9d973
terminal rbac fixed
Ash-exp May 10, 2023
be535ee
fixed cluster id bug for resource browser
Ash-exp May 10, 2023
b299e84
fixed pod log bug
Ash-exp May 10, 2023
6c2cbe4
fix: deploymentType Validation condition
Ash-exp May 21, 2023
10b0876
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp Jun 1, 2023
c457551
fix: Pod Logs Bug
Ash-exp Jun 1, 2023
47bc404
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp Jun 12, 2023
fd82475
feat: logs prev container (#3469)
rish2320 Jun 13, 2023
fb145a1
Updated latest image of hyperion in installer
prakarsh-dt Jun 13, 2023
c5f54cc
Updated latest image of devtron in installer
prakarsh-dt Jun 13, 2023
9ed6e27
Updated latest image of devtron in installer
prakarsh-dt Jun 13, 2023
f606dcf
Updated latest image of hyperion in installer
prakarsh-dt Jun 13, 2023
91e6e08
Updated latest image of hyperion in installer
prakarsh-dt Jun 13, 2023
f0c6470
Updated latest image of devtron in installer
prakarsh-dt Jun 13, 2023
6d36cb0
fix: App delete from ACD with non cascade (#3339)
Ash-exp Jun 13, 2023
0a7eb78
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp Jun 13, 2023
896218b
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp Jun 19, 2023
7bbd2a7
Merge branch 'main' into fix-argocd-rbac-kubelink
Ash-exp Jun 21, 2023
6181113
reverted to devtron chart values
Ash-exp Jun 21, 2023
bccf33c
reverted migrator changes
Ash-exp Jun 21, 2023
adaf043
fix: deployment app type for internal use false
Ash-exp Jun 21, 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
7 changes: 5 additions & 2 deletions api/helm-app/HelmAppService.go
Original file line number Diff line number Diff line change
Expand Up @@ -795,12 +795,15 @@ func (impl *HelmAppServiceImpl) DecodeAppId(appId string) (*AppIdentifier, error
if len(component) != 3 {
return nil, fmt.Errorf("malformed app id %s", appId)
}
clustewrId, err := strconv.Atoi(component[0])
clusterId, err := strconv.Atoi(component[0])
if err != nil {
return nil, err
}
if clusterId <= 0 {
return nil, fmt.Errorf("target cluster is not provided")
}
return &AppIdentifier{
ClusterId: clustewrId,
ClusterId: clusterId,
Namespace: component[1],
ReleaseName: component[2],
}, nil
Expand Down
10 changes: 6 additions & 4 deletions client/k8s/application/Application.go
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"`
IsPrevContainerLogsEnabled bool `json:"previous"`
}

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.IsPrevContainerLogsEnabled,
}
if podLogsRequest.SinceTime != nil {
podLogOptions.SinceTime = podLogsRequest.SinceTime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,13 @@ func (impl AppStoreDeploymentServiceImpl) AppStoreDeployOperationDB(installAppVe
// installedAppModel.DeploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_HELM
// }
//}

if !isInternalUse {
if isGitOpsConfigured && appInstallationMode == util2.SERVER_MODE_FULL {
installAppVersionRequest.DeploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_ACD
} else {
installAppVersionRequest.DeploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_HELM
}
}
if installAppVersionRequest.DeploymentAppType == "" {
if isGitOpsConfigured {
installAppVersionRequest.DeploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_ACD
Expand Down
7 changes: 7 additions & 0 deletions pkg/pipeline/PipelineBuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -1749,6 +1749,13 @@ func (impl PipelineBuilderImpl) SetPipelineDeploymentAppType(pipelineCreateReque
//}

for _, pipeline := range pipelineCreateRequest.Pipelines {
if !impl.deploymentConfig.IsInternalUse {
if isGitOpsConfigured {
pipeline.DeploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_ACD
} else {
pipeline.DeploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_HELM
}
}
if pipeline.DeploymentAppType == "" {
if isGitOpsConfigured {
pipeline.DeploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_ACD
Expand Down
2 changes: 1 addition & 1 deletion util/ValidatorHelper.go
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
Loading