Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ae32c1e
Merge pull request #233 from devtron-labs/develop-sync-rc-22apr
vikramdevtron Apr 22, 2025
9941bb2
fix: high memory usage in kubelink informers
Ash-exp Apr 22, 2025
ba9f61d
fix: logging statements
Ash-exp Apr 22, 2025
0f0a00d
Merge pull request #234 from devtron-labs/fix-kubelink-cache-issue-main
Ash-exp Apr 23, 2025
09d88de
fix for async mode change
kartik-579 Apr 23, 2025
674fc28
Merge pull request #235 from devtron-labs/fix-panic
kartik-579 Apr 23, 2025
c5daeae
Merge remote-tracking branch 'origin/main' into chore-rc-main-sync-25…
Ash-exp Apr 25, 2025
45edc27
Merge pull request #237 from devtron-labs/chore-rc-main-sync-25-apr
vikramdevtron Apr 25, 2025
785e802
main sync and vendor update
vikramdevtron Apr 25, 2025
08ed2e1
Merge pull request #238 from devtron-labs/main-sync-rc-25apr
vikramdevtron Apr 25, 2025
5092ec3
Merge pull request #239 from devtron-labs/release-candidate-v0.34.0
vikramdevtron Apr 25, 2025
8be8abf
vendor update for release 34
vikramdevtron Apr 25, 2025
2c8e67c
Merge pull request #240 from devtron-labs/vendor-update-packet-34
vikramdevtron Apr 25, 2025
80bd805
Merge pull request #242 from devtron-labs/fix-debug-ci
Shivam-nagar23 Apr 29, 2025
2886a01
fix: docker login is not executed for pre/post cd stage executions
Ash-exp Apr 30, 2025
4ed7b7c
chore: dependency version updated to 'origin/fix-docker-login-cd-stag…
Ash-exp Apr 30, 2025
3074d15
Merge pull request #248 from devtron-labs/fix-docker-login-cd-stage-main
Ash-exp Apr 30, 2025
e49b177
feat: mount file type variable in ci-runner through cm
Ash-exp May 2, 2025
ff0c2fb
chore: dependency version updated to 'origin/feat-file-variable-cm-mo…
Ash-exp May 3, 2025
4b6a6c1
Merge remote-tracking branch 'origin/feat-file-variable-cm-mount-main…
Ash-exp May 4, 2025
4a6b141
chore: dependency version updated to 'origin/chore-main-sync-develop-…
Ash-exp May 4, 2025
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
2 changes: 1 addition & 1 deletion chart-sync/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.4
toolchain go1.22.6

replace (
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
)

Expand Down
4 changes: 2 additions & 2 deletions chart-sync/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c h1:lIIGAMWM4UwSwrd5Ljm1x4vtNRm1s0q2mTqdQWX8L6Q=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a h1:2vokYnB5dWRaDxCJbp+WKO+lwEQGtxMBi/qkUkWQH70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY=
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
Expand Down
4 changes: 2 additions & 2 deletions chart-sync/vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ github.com/containerd/platforms
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
## explicit; go 1.21
github.com/devtron-labs/common-lib/constants
github.com/devtron-labs/common-lib/fetchAllEnv
Expand Down Expand Up @@ -791,4 +791,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
6 changes: 3 additions & 3 deletions ci-runner/executor/StageExecutor.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest
stepIndexFileMountMap := make(map[int]map[string]*fileContentDto)
for _, inVar := range step.InputVars {
if inVar.Format == commonBean.FormatTypeFile {
fileContent := newFileContentDto(inVar.FileContent, inVar.Value)
fileContent := newFileContentDto(inVar.FileReferencePath, inVar.Value)
if fileMap, ok := stepIndexFileMountMap[inVar.VariableStepIndexInPlugin]; ok {
fileMap[inVar.Name] = fileContent
stepIndexFileMountMap[inVar.VariableStepIndexInPlugin] = fileMap
Expand All @@ -320,8 +320,8 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest
if fileMap, ok := stepIndexFileMountMap[step.Index]; ok {
for _, inVar := range step.InputVars {
if fileContent, ok := fileMap[inVar.Name]; ok {
inVar.Value = fileContent.filePath
inVar.FileContent = fileContent.content
inVar.Value = fileContent.mountPath
inVar.FileReferencePath = fileContent.referencePath
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ci-runner/executor/scriptExecutor.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@ type executionConf struct {
}

type fileContentDto struct {
content string
filePath string
referencePath string
mountPath string
}

func newFileContentDto(content, filePath string) *fileContentDto {
func newFileContentDto(fileReferencePath, fileMountPath string) *fileContentDto {
return &fileContentDto{
content: content,
filePath: filePath,
referencePath: fileReferencePath,
mountPath: fileMountPath,
}
}

Expand Down
2 changes: 1 addition & 1 deletion ci-runner/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

toolchain go1.21.8

replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a

require (
github.com/Knetic/govaluate v3.0.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions ci-runner/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c h1:lIIGAMWM4UwSwrd5Ljm1x4vtNRm1s0q2mTqdQWX8L6Q=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a h1:2vokYnB5dWRaDxCJbp+WKO+lwEQGtxMBi/qkUkWQH70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=
Expand Down
28 changes: 13 additions & 15 deletions ci-runner/helper/DockerHelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,21 +167,19 @@ func (impl *DockerHelperImpl) StartDockerDaemonAndDockerLogin(commonWorkflowRequ
util.PrintFileContent(DOCKERD_OUTPUT_FILE_PATH)
return err
}
if commonWorkflowRequest.CiBuildConfig != nil && !commonWorkflowRequest.CiBuildConfig.CiBuildType.IsSkipBuildType() {
ciContext := cicxt.BuildCiContext(context.Background(), commonWorkflowRequest.EnableSecretMasking)
err = impl.DockerLogin(ciContext, &DockerCredentials{
DockerUsername: commonWorkflowRequest.DockerUsername,
DockerPassword: commonWorkflowRequest.DockerPassword,
AwsRegion: commonWorkflowRequest.AwsRegion,
AccessKey: commonWorkflowRequest.AccessKey,
SecretKey: commonWorkflowRequest.SecretKey,
DockerRegistryURL: commonWorkflowRequest.IntermediateDockerRegistryUrl,
DockerRegistryType: commonWorkflowRequest.DockerRegistryType,
CredentialsType: commonWorkflowRequest.CredentialsType,
})
if err != nil {
return err
}
ciContext := cicxt.BuildCiContext(context.Background(), commonWorkflowRequest.EnableSecretMasking)
err = impl.DockerLogin(ciContext, &DockerCredentials{
DockerUsername: commonWorkflowRequest.DockerUsername,
DockerPassword: commonWorkflowRequest.DockerPassword,
AwsRegion: commonWorkflowRequest.AwsRegion,
AccessKey: commonWorkflowRequest.AccessKey,
SecretKey: commonWorkflowRequest.SecretKey,
DockerRegistryURL: commonWorkflowRequest.IntermediateDockerRegistryUrl,
DockerRegistryType: commonWorkflowRequest.DockerRegistryType,
CredentialsType: commonWorkflowRequest.CredentialsType,
})
if err != nil {
return err
}

return nil
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ci-runner/vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ github.com/cespare/xxhash/v2
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
## explicit
github.com/davecgh/go-spew/spew
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
## explicit; go 1.21
github.com/devtron-labs/common-lib/blob-storage
github.com/devtron-labs/common-lib/constants
Expand Down Expand Up @@ -991,4 +991,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
3 changes: 2 additions & 1 deletion common-lib/utils/k8s/commonBean/bean.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
)

const (
ConfigMapKind = "ConfigMap"
SecretKind = "Secret"
ServiceKind = "Service"
ServiceAccountKind = "ServiceAccount"
Expand Down Expand Up @@ -300,8 +301,8 @@ type PodMetadata struct {
EphemeralContainers []*EphemeralContainerData `json:"ephemeralContainers"`
}

// use value field as generic type
// InfoItem contains arbitrary, human readable information about an application
// use value field as generic type
type InfoItem struct {
// Name is a human readable title for this piece of information.
Name string `json:"name,omitempty"`
Expand Down
19 changes: 12 additions & 7 deletions common-lib/workflow/bean.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package workflow

import (
"encoding/base64"
"encoding/json"
"fmt"
"os"
Expand Down Expand Up @@ -168,8 +167,8 @@ type VariableObject struct {
ReferenceVariableName string `json:"referenceVariableName"`
ReferenceVariableStepIndex int `json:"referenceVariableStepIndex"`
VariableStepIndexInPlugin int `json:"variableStepIndexInPlugin"`
FileContent string `json:"fileContent"` // FileContent is the base64 encoded content of the file
TypedValue interface{} `json:"-"` // TypedValue is the formatted value of the variable after type conversion
FileReferencePath string `json:"fileReferencePath"` // FileContent is the base64 encoded content of the file
TypedValue interface{} `json:"-"` // TypedValue is the formatted value of the variable after type conversion
}

// TypeCheck converts the VariableObject.Value to the VariableObject.Format type
Expand All @@ -188,19 +187,25 @@ func (v *VariableObject) TypeCheck() error {
return nil
}

// SetFileContent decodes the base64 encoded file content and writes it to the file at filePath
// SetFileContent sets the content of the file referenced by the VariableObject.FileReferencePath field.
func (v *VariableObject) SetFileContent(filePath string) error {
if v.Format != FormatTypeFile {
return nil
}
if len(v.FileReferencePath) == 0 {
// for plugins we may receive the filePath as "",
// even thought VariableObject.Value is there;
// for this case don't mount the file.
return nil
}
file, fileErr := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.ModePerm)
if fileErr != nil {
return fileErr
}
defer file.Close()
fileBytes, fileErr := base64.StdEncoding.DecodeString(v.FileContent)
if fileErr != nil {
return fileErr
fileBytes, err := os.ReadFile(v.FileReferencePath)
if err != nil {
return err
}
_, wErr := file.Write(fileBytes)
if wErr != nil {
Expand Down
2 changes: 1 addition & 1 deletion git-sensor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

toolchain go1.22.4

replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a

require (
github.com/caarlos0/env v3.5.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions git-sensor/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c h1:lIIGAMWM4UwSwrd5Ljm1x4vtNRm1s0q2mTqdQWX8L6Q=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a h1:2vokYnB5dWRaDxCJbp+WKO+lwEQGtxMBi/qkUkWQH70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk=
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=
Expand Down
4 changes: 2 additions & 2 deletions git-sensor/vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ github.com/cyphar/filepath-securejoin
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
## explicit; go 1.21
github.com/devtron-labs/common-lib/constants
github.com/devtron-labs/common-lib/fetchAllEnv
Expand Down Expand Up @@ -488,4 +488,4 @@ gopkg.in/yaml.v3
# mellium.im/sasl v0.3.2
## explicit; go 1.20
mellium.im/sasl
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
2 changes: 1 addition & 1 deletion image-scanner/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ require (
mellium.im/sasl v0.3.2 // indirect
)

replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
4 changes: 2 additions & 2 deletions image-scanner/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c h1:lIIGAMWM4UwSwrd5Ljm1x4vtNRm1s0q2mTqdQWX8L6Q=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a h1:2vokYnB5dWRaDxCJbp+WKO+lwEQGtxMBi/qkUkWQH70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
Expand Down
4 changes: 2 additions & 2 deletions image-scanner/vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2
github.com/coreos/clair/api/v3/clairpb
github.com/coreos/clair/database
github.com/coreos/clair/ext/versionfmt
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
## explicit; go 1.21
github.com/devtron-labs/common-lib/constants
github.com/devtron-labs/common-lib/fetchAllEnv
Expand Down Expand Up @@ -440,4 +440,4 @@ google.golang.org/protobuf/types/known/wrapperspb
# mellium.im/sasl v0.3.2
## explicit; go 1.20
mellium.im/sasl
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
2 changes: 1 addition & 1 deletion kubelink/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ require (
)

replace (
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0
// https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280
k8s.io/api => k8s.io/api v0.29.0
Expand Down
4 changes: 2 additions & 2 deletions kubelink/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c h1:lIIGAMWM4UwSwrd5Ljm1x4vtNRm1s0q2mTqdQWX8L6Q=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425083942-5092ec30954c/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a h1:2vokYnB5dWRaDxCJbp+WKO+lwEQGtxMBi/qkUkWQH70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504163942-4b6a6c18584a/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic=
Expand Down
Loading
Loading