Skip to content

Commit b0c25c2

Browse files
Ash-expAsh-exp
committed
Merge remote-tracking branch 'origin/develop' into fix-argocd-update-event
2 parents ec831a7 + 1e3ca32 commit b0c25c2

241 files changed

Lines changed: 60141 additions & 1029 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎chart-sync/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.4
55
toolchain go1.22.6
66

77
replace (
8-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
8+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9
99
helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
1010
)
1111

‎chart-sync/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
5454
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5555
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
5656
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
57-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce h1:U/TOmo1tqQVliypXwEtVStpzZo19hjNm4SEUR9FrTXM=
58-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
57+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9 h1:q0XiCMT/fxnnYf9r/S/63XwVRS/S9CJTDpuoHrdklt8=
58+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9/go.mod h1:CXQGEo+kZc7JPX5hn4jJf1msal9q/ExSdAYGkHNPnQw=
5959
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY=
6060
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
6161
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=

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

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

‎chart-sync/vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ github.com/containerd/platforms
9393
# github.com/davecgh/go-spew v1.1.1
9494
## explicit
9595
github.com/davecgh/go-spew/spew
96-
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
96+
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9
9797
## explicit; go 1.21
9898
github.com/devtron-labs/common-lib/constants
9999
github.com/devtron-labs/common-lib/fetchAllEnv
@@ -791,4 +791,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
791791
# sigs.k8s.io/yaml v1.3.0
792792
## explicit; go 1.12
793793
sigs.k8s.io/yaml
794-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
794+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9

‎ci-runner/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ FROM docker:20.10.24-dind
1818
RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq && \
1919
ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
2020
apk -Uuv add groff less python3 py3-pip && \
21-
pip3 install awscli==1.38.11 && \
2221
apk --purge -v del py-pip && \
2322
rm /var/cache/apk/*
2423

‎ci-runner/Dockerfile-v27‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ FROM docker:27.3-dind
1818

1919
RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq && \
2020
ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
21-
apk -Uuv add groff less python3 py3-pip pipx && \
22-
pipx ensurepath && pipx install awscli && \
23-
cp /root/.local/bin/aws* /usr/local/bin && \
21+
apk -Uuv add groff less python3 py3-pip && \
2422
apk --purge -v del py-pip && \
2523
rm /var/cache/apk/*
2624

‎ci-runner/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
toolchain go1.21.8
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9
88

99
require (
1010
github.com/Knetic/govaluate v3.0.0+incompatible

‎ci-runner/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
9595
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9696
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
9797
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
98-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce h1:U/TOmo1tqQVliypXwEtVStpzZo19hjNm4SEUR9FrTXM=
99-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
98+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9 h1:q0XiCMT/fxnnYf9r/S/63XwVRS/S9CJTDpuoHrdklt8=
99+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519050603-ae9f880733b9/go.mod h1:CXQGEo+kZc7JPX5hn4jJf1msal9q/ExSdAYGkHNPnQw=
100100
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
101101
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
102102
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

‎ci-runner/helper/DockerHelper.go‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,17 +167,20 @@ func (impl *DockerHelperImpl) StartDockerDaemonAndDockerLogin(commonWorkflowRequ
167167
util.PrintFileContent(DOCKERD_OUTPUT_FILE_PATH)
168168
return err
169169
}
170-
ciContext := cicxt.BuildCiContext(context.Background(), commonWorkflowRequest.EnableSecretMasking)
171-
err = impl.DockerLogin(ciContext, &DockerCredentials{
172-
DockerUsername: commonWorkflowRequest.DockerUsername,
173-
DockerPassword: commonWorkflowRequest.DockerPassword,
174-
AwsRegion: commonWorkflowRequest.AwsRegion,
175-
AccessKey: commonWorkflowRequest.AccessKey,
176-
SecretKey: commonWorkflowRequest.SecretKey,
177-
DockerRegistryURL: commonWorkflowRequest.IntermediateDockerRegistryUrl,
178-
DockerRegistryType: commonWorkflowRequest.DockerRegistryType,
179-
CredentialsType: commonWorkflowRequest.CredentialsType,
180-
})
170+
shouldDockerLogin := len(commonWorkflowRequest.IntermediateDockerRegistryUrl) != 0
171+
if shouldDockerLogin {
172+
ciContext := cicxt.BuildCiContext(context.Background(), commonWorkflowRequest.EnableSecretMasking)
173+
err = impl.DockerLogin(ciContext, &DockerCredentials{
174+
DockerUsername: commonWorkflowRequest.DockerUsername,
175+
DockerPassword: commonWorkflowRequest.DockerPassword,
176+
AwsRegion: commonWorkflowRequest.AwsRegion,
177+
AccessKey: commonWorkflowRequest.AccessKey,
178+
SecretKey: commonWorkflowRequest.SecretKey,
179+
DockerRegistryURL: commonWorkflowRequest.IntermediateDockerRegistryUrl,
180+
DockerRegistryType: commonWorkflowRequest.DockerRegistryType,
181+
CredentialsType: commonWorkflowRequest.CredentialsType,
182+
})
183+
}
181184
if err != nil {
182185
return err
183186
}

‎ci-runner/vendor/github.com/devtron-labs/common-lib/blob-storage/AwsS3Blob.go‎

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

0 commit comments

Comments
 (0)