Skip to content

Commit b77e05d

Browse files
prkhrkatprkhrkat
authored
Merge pull request #6235 from devtron-labs/mandatory-tag-v2
misc: Tag propagate in CI and Pre-Post CD
2 parents 403a305 + 36181e2 commit b77e05d

File tree

9 files changed

+65
-17
lines changed

9 files changed

+65
-17
lines changed

‎cmd/external-app/wire_gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
291-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250124111030-ae27cdeb9349
292-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124111030-ae27cdeb9349
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226
293293
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
294294
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
295295
k8s.io/api => k8s.io/api v0.29.7

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
792792
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
793793
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
794794
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
795-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250124111030-ae27cdeb9349 h1:AlIhzAP8dd6FRHFV+SaYFBaPN4cbglP7C1yPR7fWgMI=
796-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250124111030-ae27cdeb9349/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124111030-ae27cdeb9349 h1:J8rZroVKZJrVB7uN9QQKCkol7OWp4DKv8RQQdUbWee8=
798-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124111030-ae27cdeb9349/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
795+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226 h1:67Im8ME0J2Ukd8xbKuR+0rzT3oO0Obcd58keDb80C3I=
796+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226 h1:yYHCt3F0xLW0VlBGXqAsXLJElLcnEJCUkpQJxmgkTb4=
798+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
799799
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
800800
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
801801
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

‎pkg/pipeline/WorkflowService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func (impl *WorkflowServiceImpl) createWorkflowTemplate(workflowRequest *types.W
196196
}
197197
workflowTemplate.ConfigMaps = workflowConfigMaps
198198
workflowTemplate.Secrets = workflowSecrets
199-
workflowTemplate.Volumes = executors.ExtractVolumesFromCmCs(workflowConfigMaps, workflowSecrets)
199+
workflowTemplate.Volumes = executors.ExtractVolumes(workflowConfigMaps, workflowSecrets)
200200

201201
workflowMainContainer, err := workflowRequest.GetWorkflowMainContainer(impl.ciCdConfig, infraConfiguration, workflowJson, &workflowTemplate, workflowConfigMaps, workflowSecrets)
202202
if err != nil {

‎pkg/pipeline/executors/WorkflowUtils.go

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
2222
"github.com/argoproj/argo-workflows/v3/pkg/client/clientset/versioned"
2323
v1alpha12 "github.com/argoproj/argo-workflows/v3/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
24+
"github.com/devtron-labs/common-lib/utils"
2425
bean2 "github.com/devtron-labs/devtron/api/bean"
2526
"github.com/devtron-labs/devtron/internal/sql/repository"
2627
"github.com/devtron-labs/devtron/pkg/pipeline/bean"
@@ -34,6 +35,17 @@ import (
3435

3536
var ArgoWorkflowOwnerRef = v1.OwnerReference{APIVersion: "argoproj.io/v1alpha1", Kind: "Workflow", Name: "{{workflow.name}}", UID: "{{workflow.uid}}", BlockOwnerDeletion: &[]bool{true}[0]}
3637

38+
func ExtractVolumes(configMaps []bean2.ConfigSecretMap, secrets []bean2.ConfigSecretMap) []v12.Volume {
39+
var volumes []v12.Volume
40+
configMapVolumes := ExtractVolumesFromCmCs(configMaps, secrets)
41+
volumes = append(volumes, configMapVolumes...)
42+
43+
// Add downwardAPI volume
44+
downwardAPIVolume := createDownwardAPIVolume()
45+
volumes = append(volumes, downwardAPIVolume)
46+
return volumes
47+
}
48+
3749
func ExtractVolumesFromCmCs(configMaps []bean2.ConfigSecretMap, secrets []bean2.ConfigSecretMap) []v12.Volume {
3850
var volumes []v12.Volume
3951
configMapVolumes := extractVolumesFromConfigSecretMaps(true, configMaps)
@@ -45,9 +57,34 @@ func ExtractVolumesFromCmCs(configMaps []bean2.ConfigSecretMap, secrets []bean2.
4557
for _, volume := range secretVolumes {
4658
volumes = append(volumes, volume)
4759
}
60+
4861
return volumes
4962
}
5063

64+
func createDownwardAPIVolume() v12.Volume {
65+
return v12.Volume{
66+
Name: utils.DEVTRON_SELF_DOWNWARD_API_VOLUME,
67+
VolumeSource: v12.VolumeSource{
68+
DownwardAPI: &v12.DownwardAPIVolumeSource{
69+
Items: []v12.DownwardAPIVolumeFile{
70+
{
71+
Path: utils.POD_LABELS,
72+
FieldRef: &v12.ObjectFieldSelector{
73+
FieldPath: "metadata." + utils.POD_LABELS,
74+
},
75+
},
76+
{
77+
Path: utils.POD_ANNOTATIONS,
78+
FieldRef: &v12.ObjectFieldSelector{
79+
FieldPath: "metadata." + utils.POD_ANNOTATIONS,
80+
},
81+
},
82+
},
83+
},
84+
},
85+
}
86+
}
87+
5188
func extractVolumesFromConfigSecretMaps(isCm bool, configSecretMaps []bean2.ConfigSecretMap) []v12.Volume {
5289
var volumes []v12.Volume
5390
for _, configSecretMap := range configSecretMaps {

‎pkg/pipeline/types/Workflow.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,13 @@ func (workflowRequest *WorkflowRequest) GetWorkflowMainContainer(config *CiCdCon
507507
TerminationMessagePath: workFlow.GetTerminalLogFilePath(),
508508
Resources: workflowRequest.GetLimitReqCpuMem(config, infraConfigurations),
509509
}
510+
// add volumeMount for downwardAPI volume
511+
workflowMainContainer.VolumeMounts = append(workflowMainContainer.VolumeMounts,
512+
v1.VolumeMount{
513+
Name: utils.DEVTRON_SELF_DOWNWARD_API_VOLUME,
514+
MountPath: utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH,
515+
},
516+
)
510517
if workflowRequest.Type == bean.CI_WORKFLOW_PIPELINE_TYPE || workflowRequest.Type == bean.JOB_WORKFLOW_PIPELINE_TYPE {
511518
workflowMainContainer.Ports = []v1.ContainerPort{{
512519
// exposed for user specific data from ci container
@@ -557,7 +564,7 @@ func (workflowRequest *WorkflowRequest) updateVolumeMountsForCi(config *CiCdConf
557564
return err
558565
}
559566
workflowTemplate.Volumes = append(workflowTemplate.Volumes, volume...)
560-
workflowMainContainer.VolumeMounts = volumeMounts
567+
workflowMainContainer.VolumeMounts = append(workflowMainContainer.VolumeMounts, volumeMounts...)
561568
return nil
562569
}
563570

‎vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,15 @@ github.com/davecgh/go-spew/spew
336336
# github.com/deckarep/golang-set v1.8.0
337337
## explicit; go 1.17
338338
github.com/deckarep/golang-set
339-
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250124111030-ae27cdeb9349
339+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226
340340
## explicit; go 1.21
341341
github.com/devtron-labs/authenticator/apiToken
342342
github.com/devtron-labs/authenticator/client
343343
github.com/devtron-labs/authenticator/jwt
344344
github.com/devtron-labs/authenticator/middleware
345345
github.com/devtron-labs/authenticator/oidc
346346
github.com/devtron-labs/authenticator/password
347-
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124111030-ae27cdeb9349
347+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226
348348
## explicit; go 1.21
349349
github.com/devtron-labs/common-lib/async
350350
github.com/devtron-labs/common-lib/blob-storage
@@ -2214,8 +2214,8 @@ xorm.io/xorm/log
22142214
xorm.io/xorm/names
22152215
xorm.io/xorm/schemas
22162216
xorm.io/xorm/tags
2217-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250124111030-ae27cdeb9349
2218-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124111030-ae27cdeb9349
2217+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226
2218+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226
22192219
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
22202220
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
22212221
# k8s.io/api => k8s.io/api v0.29.7

‎wire_gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)