Skip to content

Commit e1bc9f1

Browse files
kartik-579Ash-expJuneezeeprakarsh-dtpawan-mehta-dt
authored
Oss sync (#269)
* fix: acd app delete non cascade (#3506) * acd app delete with non-cascade * handled DeleteErrorResponse length error * added go routine * argo non-casecade delete for helm and devtron app * fix: api response for cluster connection error * fix: nil pointer for cluster details * fix: updated test interface for pipeline * fix: non-cascade delete condition * fix: forceDelete and cascadeDelete validation * fix: delete response for force delete req * fix: added clusterName to res * fix: added clusterName to cluster-conn api resp * fix: updated non-cascade api resp * fix: updated non-cascade api err return * fix: updated chart list delete bug * fix: installed app delete bug * fix: installed app noncascade delete bug * fix: helm release force delete * fix: appstore release force delete * fix: appstore deployment list response * fix: bulk delete deployment api condition * fixed typo and response message * fix: bulk delete cd pipeline api payload * fix: logger and conditional chain * updated wire * modifed cluster services * chore: replace `github.com/ghodss/yaml` with `sigs.k8s.io/yaml` (#3355) At the time of making this commit, the package `github.com/ghodss/yaml` is no longer actively maintained. `sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively maintained by Kubernetes SIG. Signed-off-by: Eng Zer Jun <[email protected]> * release: PR for v0.6.18-rc.2 (#3510) * Created release-notes files * Updated release notes * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Updated latest image of dashboard in installer * Updated release notes * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Updated latest image of dashboard in installer * Updated latest image of dashboard in installer * Updated latest image of dashboard in installer * Updated latest image of dashboard in installer * Updated latest image of dashboard in installer * Updated release-notes files * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Updated latest image of ci-runner in installer * Updated latest image of kubelink in installer * Updated latest image of dashboard in installer * Updated latest image of dashboard in installer * Updated release-notes files * Updated latest image of devtron in installer * Updated latest image of hyperion in installer * Updated latest image of dashboard in installer * Updated release-notes files * Updated latest image of dashboard in installer * Updated release-notes files * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Updated latest image of dashboard in installer * Updated latest image of ci-runner in installer * Updated latest image of dashboard in installer * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Updated latest image of dashboard in installer * Updated release-notes files * Update devtron-installer.yaml * Update installation-script * Update values.yaml * Update devtron-bom.yaml * Update Chart.yaml * Update devtron-bom.yaml * Update values.yaml * Update releasenotes.md * Updated release-notes files --------- Co-authored-by: Pawan Mehta <[email protected]> * task: updated workflow name provision in app workflow api (#3526) * updated workflow name provision in app workflow api * review comment --------- Signed-off-by: Eng Zer Jun <[email protected]> Co-authored-by: Asutosh Das <[email protected]> Co-authored-by: Eng Zer Jun <[email protected]> Co-authored-by: Prakarsh <[email protected]> Co-authored-by: Pawan Mehta <[email protected]>
1 parent ad8ab0c commit e1bc9f1

File tree

13 files changed

+74
-36
lines changed

13 files changed

+74
-36
lines changed

‎api/restHandler/CoreAppRestHandler.go‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const (
6161
APP_DELETE_FAILED_RESP = "App deletion failed, please try deleting from Devtron UI"
6262
APP_CREATE_SUCCESSFUL_RESP = "App created successfully."
6363
APP_WORKFLOW_CREATE_SUCCESSFUL_RESP = "App workflow created successfully."
64+
WORKFLOW_NAME_EMPTY = ""
6465
)
6566

6667
type CoreAppRestHandler interface {
@@ -194,7 +195,8 @@ func (handler CoreAppRestHandlerImpl) GetAppAllDetail(w http.ResponseWriter, r *
194195
//get/build global deployment template ends
195196

196197
//get/build app workflows starts
197-
appWorkflows, err, statusCode := handler.buildAppWorkflows(appId)
198+
//using empty workflow name because it is optional, if not provided then workflows will be fetched on the basis of app
199+
appWorkflows, err, statusCode := handler.buildAppWorkflows(appId, WORKFLOW_NAME_EMPTY)
198200
if err != nil {
199201
common.WriteJsonResp(w, err, nil, statusCode)
200202
return
@@ -609,13 +611,23 @@ func (handler CoreAppRestHandlerImpl) buildAppEnvironmentDeploymentTemplate(appI
609611
}
610612

611613
// validate and build workflows
612-
func (handler CoreAppRestHandlerImpl) buildAppWorkflows(appId int) ([]*appBean.AppWorkflow, error, int) {
614+
func (handler CoreAppRestHandlerImpl) buildAppWorkflows(appId int, workflowName string) ([]*appBean.AppWorkflow, error, int) {
613615
handler.logger.Debugw("Getting app detail - workflows", "appId", appId)
614-
615-
workflowsList, err := handler.appWorkflowService.FindAppWorkflows(appId)
616-
if err != nil {
617-
handler.logger.Errorw("error in fetching workflows for app in GetAppAllDetail", "err", err)
618-
return nil, err, http.StatusInternalServerError
616+
var workflowsList []appWorkflow.AppWorkflowDto
617+
var err error
618+
if len(workflowName) != 0 {
619+
workflow, err := handler.appWorkflowService.FindAppWorkflowByName(workflowName, appId)
620+
if err != nil {
621+
handler.logger.Errorw("error in fetching workflow by name", "err", err, "workflowName", workflowName, "appId", appId)
622+
return nil, err, http.StatusInternalServerError
623+
}
624+
workflowsList = []appWorkflow.AppWorkflowDto{workflow}
625+
} else {
626+
workflowsList, err = handler.appWorkflowService.FindAppWorkflows(appId)
627+
if err != nil {
628+
handler.logger.Errorw("error in fetching workflows for app in GetAppAllDetail", "err", err)
629+
return nil, err, http.StatusInternalServerError
630+
}
619631
}
620632

621633
var appWorkflowsResp []*appBean.AppWorkflow
@@ -2153,7 +2165,8 @@ func (handler CoreAppRestHandlerImpl) GetAppWorkflow(w http.ResponseWriter, r *h
21532165
}
21542166

21552167
//get/build app workflows starts
2156-
appWorkflows, err, statusCode := handler.buildAppWorkflows(appId)
2168+
//using empty workflow name because it is optional, if not provided then workflows will be fetched on the basis of app
2169+
appWorkflows, err, statusCode := handler.buildAppWorkflows(appId, WORKFLOW_NAME_EMPTY)
21572170
if err != nil {
21582171
common.WriteJsonResp(w, err, nil, statusCode)
21592172
return
@@ -2201,9 +2214,10 @@ func (handler CoreAppRestHandlerImpl) GetAppWorkflowAndOverridesSample(w http.Re
22012214
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
22022215
return
22032216
}
2217+
workflowName := r.URL.Query().Get("workflowName")
22042218
token := r.Header.Get("token")
22052219
//get/build app workflows starts
2206-
appWorkflows, err, statusCode := handler.buildAppWorkflows(appId)
2220+
appWorkflows, err, statusCode := handler.buildAppWorkflows(appId, workflowName)
22072221
if err != nil {
22082222
common.WriteJsonResp(w, err, nil, statusCode)
22092223
return

‎charts/devtron/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: devtron-operator
3-
appVersion: 0.6.18-rc.1
3+
appVersion: 0.6.18-rc.2
44
description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
55
keywords:
66
- Devtron

‎charts/devtron/devtron-bom.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ global:
99
runAsNonRoot: true
1010

1111
installer:
12-
release: "v0.6.18-rc.1"
12+
release: "v0.6.18-rc.2"
1313
image: "quay.io/devtron/inception"
1414
tag: "44b30917-185-13275"
1515

1616
components:
1717
dashboard:
18-
image: "quay.io/devtron/dashboard:b1ae0175-325-14079"
18+
image: "quay.io/devtron/dashboard:961adac9-325-14236"
1919
config:
2020
extraConfigs:
2121
USE_V2: "true"
2222
ENABLE_BUILD_CONTEXT: "true"
2323
devtron:
24-
image: "quay.io/devtron/hyperion:2c6ed701-280-14059"
25-
cicdImage: "quay.io/devtron/devtron:2c6ed701-434-14060"
24+
image: "quay.io/devtron/hyperion:73f1aa56-280-14239"
25+
cicdImage: "quay.io/devtron/devtron:73f1aa56-434-14240"
2626
argocdDexServer:
2727
image: "ghcr.io/dexidp/dex:v2.30.2"
2828
initContainer:
2929
authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"
3030
kubelink:
31-
image: "quay.io/devtron/kubelink:451a1a1a-318-13790"
31+
image: "quay.io/devtron/kubelink:63967b3a-318-14165"
3232
configs:
3333
ENABLE_HELM_RELEASE_CACHE: "true"
3434
PG_ADDR: postgresql-postgresql.devtroncd
@@ -48,10 +48,10 @@ components:
4848
envVars:
4949
devtron:
5050
GIT_BRANCH: "main"
51-
GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
51+
GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
5252
casbin:
5353
GIT_BRANCH: "main"
54-
GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
54+
GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
5555

5656
argo-cd:
5757
global:

‎charts/devtron/values.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ global:
1010
installer:
1111
repo: "devtron-labs/devtron"
1212
# For Kubernetes version < 1.16, set release: legacy. You won't be able to upgrade Devtron unless you upgrade the K8s version to 1.16 or above.
13-
release: "v0.6.18-rc.1" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
13+
release: "v0.6.18-rc.2" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
1414
image: quay.io/devtron/inception
1515
tag: 44b30917-185-13275
1616
source: "github" # Available options are github and gitee
@@ -55,12 +55,12 @@ components:
5555
extraConfigs:
5656
USE_V2: "true"
5757
ENABLE_BUILD_CONTEXT: "true"
58-
image: "quay.io/devtron/dashboard:b1ae0175-325-14079"
58+
image: "quay.io/devtron/dashboard:961adac9-325-14236"
5959
imagePullPolicy: IfNotPresent
6060

6161
devtron:
62-
image: "quay.io/devtron/hyperion:2c6ed701-280-14059"
63-
cicdImage: "quay.io/devtron/devtron:2c6ed701-434-14060"
62+
image: "quay.io/devtron/hyperion:73f1aa56-280-14239"
63+
cicdImage: "quay.io/devtron/devtron:73f1aa56-434-14240"
6464
imagePullPolicy: IfNotPresent
6565
customOverrides: {}
6666
serviceMonitor:
@@ -92,7 +92,7 @@ components:
9292
authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"
9393

9494
kubelink:
95-
image: "quay.io/devtron/kubelink:451a1a1a-318-13790"
95+
image: "quay.io/devtron/kubelink:63967b3a-318-14165"
9696
imagePullPolicy: IfNotPresent
9797
configs:
9898
ENABLE_HELM_RELEASE_CACHE: "true"
@@ -120,13 +120,13 @@ components:
120120
SCRIPT_LOCATION: "scripts/sql/"
121121
GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
122122
DB_NAME: "orchestrator"
123-
GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
123+
GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
124124
casbin:
125125
GIT_BRANCH: "main"
126126
SCRIPT_LOCATION: "scripts/casbin/"
127127
GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
128128
DB_NAME: "casbin"
129-
GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
129+
GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
130130

131131
# values for argocd integration
132132
argo-cd:

‎manifests/install/devtron-installer.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: installer-devtron
55
namespace: devtroncd
66
spec:
7-
url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.18-rc.1/manifests/installation-script
7+
url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.18-rc.2/manifests/installation-script

‎manifests/installation-script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LTAG="v0.6.18-rc.1";
1+
LTAG="v0.6.18-rc.2";
22
REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
33

44
operatorSecret = kubectl get secret -n devtroncd devtron-operator-secret;

‎manifests/release.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
beta 1 v0.6.18-rc.1
1+
beta 2 v0.6.18-rc.2

‎manifests/yamls/dashboard.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ spec:
235235
- name: envoy-config-volume
236236
mountPath: /etc/envoy-config/
237237
- name: dashboard
238-
image: "quay.io/devtron/dashboard:b1ae0175-325-14079"
238+
image: "quay.io/devtron/dashboard:961adac9-325-14236"
239239
imagePullPolicy: IfNotPresent
240240
securityContext:
241241
allowPrivilegeEscalation: false

‎manifests/yamls/devtron.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ data:
5353
CD_NODE_TAINTS_VALUE: "ci"
5454
CD_ARTIFACT_LOCATION_FORMAT: "%d/%d.zip"
5555
DEFAULT_CD_NAMESPACE: "devtron-cd"
56-
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:7d081d0a-138-14092"
56+
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:37b94b38-138-14234"
5757
DEFAULT_CD_TIMEOUT: "3600"
5858
WF_CONTROLLER_INSTANCE_ID: "devtron-runner"
5959
CI_LOGS_KEY_PREFIX: "ci-artifacts"
@@ -162,7 +162,7 @@ spec:
162162
runAsUser: 1000
163163
containers:
164164
- name: devtron
165-
image: "quay.io/devtron/devtron:2c6ed701-434-14060"
165+
image: "quay.io/devtron/devtron:73f1aa56-434-14240"
166166
securityContext:
167167
allowPrivilegeEscalation: false
168168
runAsUser: 1000

‎manifests/yamls/kubelink.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
runAsUser: 1000
2626
containers:
2727
- name: kubelink
28-
image: "quay.io/devtron/kubelink:451a1a1a-318-13790"
28+
image: "quay.io/devtron/kubelink:63967b3a-318-14165"
2929
securityContext:
3030
allowPrivilegeEscalation: false
3131
runAsUser: 1000

0 commit comments

Comments
 (0)