Skip to content

Commit ac8081c

Browse files
vikramdevtronvikramdevtron
authored
Merge pull request #315 from devtron-labs/release-candidate-v0.40.0
sync: Release candidate v0.40.0
2 parents f21e02c + 3a23bcf commit ac8081c

Some content is hidden

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

56 files changed

+2820
-129
lines changed

‎chart-sync/go.mod‎

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

55
toolchain go1.24.3
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e
88

99
require (
1010
github.com/caarlos0/env v3.5.0+incompatible

‎chart-sync/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
4343
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4444
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
4545
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
46-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76 h1:Oxx073Vec7hW3JPNsWsZGyC3gULHVluLKTLEfXgjfeY=
47-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
46+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e h1:iJg144GwEMX7vUuNqIYBWbBniw5BvJiFw5ZXG8LuH3c=
47+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
4848
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
4949
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
5050
github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM=

‎chart-sync/vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ github.com/containerd/platforms
9595
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
9696
## explicit
9797
github.com/davecgh/go-spew/spew
98-
# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76
98+
# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e
9999
## explicit; go 1.24.0
100100
github.com/devtron-labs/common-lib/constants
101101
github.com/devtron-labs/common-lib/fetchAllEnv
@@ -967,4 +967,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
967967
sigs.k8s.io/yaml
968968
sigs.k8s.io/yaml/goyaml.v2
969969
sigs.k8s.io/yaml/goyaml.v3
970-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76
970+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e

‎ci-runner/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.0
44

55
toolchain go1.24.3
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e
88

99
require (
1010
github.com/Knetic/govaluate v3.0.0+incompatible
@@ -16,8 +16,10 @@ require (
1616
github.com/otiai10/copy v1.14.1
1717
golang.org/x/sync v0.14.0
1818
gopkg.in/yaml.v2 v2.4.0
19+
k8s.io/api v0.33.1
1920
k8s.io/apimachinery v0.33.1
2021
k8s.io/client-go v0.33.1
22+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
2123
)
2224

2325
require (
@@ -149,10 +151,8 @@ require (
149151
gopkg.in/inf.v0 v0.9.1 // indirect
150152
gopkg.in/yaml.v3 v3.0.1 // indirect
151153
gotest.tools/v3 v3.5.1 // indirect
152-
k8s.io/api v0.33.1 // indirect
153154
k8s.io/klog/v2 v2.130.1 // indirect
154155
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
155-
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
156156
mellium.im/sasl v0.3.2 // indirect
157157
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
158158
sigs.k8s.io/randfill v1.0.0 // indirect

‎ci-runner/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
114114
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
115115
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
116116
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
117-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76 h1:Oxx073Vec7hW3JPNsWsZGyC3gULHVluLKTLEfXgjfeY=
118-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
117+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e h1:iJg144GwEMX7vUuNqIYBWbBniw5BvJiFw5ZXG8LuH3c=
118+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250708132702-b8a70bd2d48e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
119119
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
120120
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
121121
github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k=

‎ci-runner/helper/CiStageError.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package helper
1818

1919
import (
20+
"errors"
2021
"fmt"
2122
"github.com/devtron-labs/common-lib/utils/workFlow"
2223
)
@@ -125,3 +126,5 @@ func (err *CdStageError) ErrorMessage() string {
125126
func (err *CdStageError) Unwrap() error {
126127
return err.stageErr
127128
}
129+
130+
var BuilderPodDeletedError = errors.New("Buildx pod(s) was terminated in response to imminent node shutdown.")

‎ci-runner/helper/CommandExecuter.go‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package helper
22

33
import (
4+
cicxt "github.com/devtron-labs/ci-runner/executor/context"
45
"os/exec"
56

6-
cicxt "github.com/devtron-labs/ci-runner/executor/context"
77
"github.com/devtron-labs/ci-runner/util"
88
)
99

1010
type CommandExecutor interface {
1111
RunCommand(ctx cicxt.CiContext, cmd *exec.Cmd) error
12+
RunCommandWithCtx(ctx cicxt.CiContext, cmd *exec.Cmd) error
1213
}
1314

1415
type CommandExecutorImpl struct {
@@ -21,3 +22,16 @@ func NewCommandExecutorImpl() *CommandExecutorImpl {
2122
func (c *CommandExecutorImpl) RunCommand(ctx cicxt.CiContext, cmd *exec.Cmd) error {
2223
return util.RunCommand(cmd)
2324
}
25+
26+
func (c *CommandExecutorImpl) RunCommandWithCtx(ctx cicxt.CiContext, cmd *exec.Cmd) error {
27+
return util.RunCommand(c.GetCommandWithCtx(ctx, cmd))
28+
}
29+
30+
func (c *CommandExecutorImpl) GetCommandWithCtx(ctx cicxt.CiContext, cmd *exec.Cmd) *exec.Cmd {
31+
// Ensure the command is run with the provided context
32+
var args []string
33+
if len(cmd.Args) > 1 {
34+
args = cmd.Args[1:]
35+
}
36+
return exec.CommandContext(ctx, cmd.Path, args...)
37+
}

0 commit comments

Comments
 (0)