Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: Release candidate v0.24.0 #72

Merged
merged 21 commits into from
Dec 4, 2024
Merged

release: Release candidate v0.24.0 #72

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
6fae4f6
fixed develop build
vikramdevtron Nov 19, 2024
90ec3a6
Merge pull request #49 from devtron-labs/fix-develop-builds
vikramdevtron Nov 19, 2024
b8de2c1
main sync develop
vikramdevtron Nov 22, 2024
8c8c007
Merge pull request #57 from devtron-labs/main-sync-develop-nov22
vikramdevtron Nov 22, 2024
0cbad7a
use GetGitRepoNameFromGitRepoUrl for getting project name from git url
prakash100198 Nov 26, 2024
3e6023e
remove unused func
prakash100198 Nov 27, 2024
368fc70
Merge pull request #63 from devtron-labs/git-url-parser-fix
prakash100198 Nov 27, 2024
ab13066
Merge branch 'main' into oss-sync-27-nov-2024
prakash100198 Nov 27, 2024
76c4a4a
Merge pull request #64 from devtron-labs/oss-sync-27-nov-2024
prakash100198 Nov 27, 2024
bb7d0c4
go mod vendor update
vikramdevtron Nov 27, 2024
c666c49
build fix
vikramdevtron Nov 27, 2024
8edd543
remove github.com/devtron-labs/kubelink from kubeoink
prakash100198 Nov 27, 2024
f18b768
Merge pull request #67 from devtron-labs/fix-develop-build
prakash100198 Nov 27, 2024
cd27adb
Merge branch 'main' into main-sync-develop-dec2
vikramdevtron Dec 2, 2024
d726745
Merge pull request #69 from devtron-labs/main-sync-develop-dec2
vikramdevtron Dec 2, 2024
6845e75
vendor update
vikramdevtron Dec 2, 2024
fcbec73
Merge pull request #70 from devtron-labs/update-vendor-rc24
vikramdevtron Dec 2, 2024
d2d605c
remove replace github.com/devtron-labs/git-sensor => github.com/devtr…
prakash100198 Dec 2, 2024
6858963
Merge pull request #71 from devtron-labs/go-mod-fix
prakash100198 Dec 2, 2024
6789e0f
makefile changes
vikramdevtron Dec 4, 2024
ca4022f
Merge pull request #73 from devtron-labs/makefile-changes
vikramdevtron Dec 4, 2024
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
4 changes: 3 additions & 1 deletion chart-sync/go.mod
View file
Open in desktop
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-20241121092824-79be1ba0e3da
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
)

Expand Down Expand Up @@ -123,3 +123,5 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/devtron-labs/chart-sync => github.com/devtron-labs/devtron-services/chart-sync v0.0.0-20241024131256-7d3ba621dece
4 changes: 2 additions & 2 deletions chart-sync/go.sum
View file
Open in desktop
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-20241121092824-79be1ba0e3da h1:wbqNhTahQp+c/htUfGxLtuzA0dddOcvdPtlSViKBJ70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f h1:Rw/PBejnZJIKj01tjcPSd1yhUUoAiWeGio/BOGeT0k0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
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
View file
Open in desktop
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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
## explicit; go 1.21
github.com/devtron-labs/common-lib/helmLib/registry
github.com/devtron-labs/common-lib/utils/http
Expand Down Expand Up @@ -785,4 +785,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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
2 changes: 1 addition & 1 deletion ci-runner/go.mod
View file
Open in desktop
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-20241121092824-79be1ba0e3da
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f

require (
github.com/Knetic/govaluate v3.0.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions ci-runner/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,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-20241121092824-79be1ba0e3da h1:wbqNhTahQp+c/htUfGxLtuzA0dddOcvdPtlSViKBJ70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f h1:Rw/PBejnZJIKj01tjcPSd1yhUUoAiWeGio/BOGeT0k0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
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
2 changes: 1 addition & 1 deletion ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go
View file
Open in desktop

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

10 changes: 3 additions & 7 deletions ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
## explicit; go 1.21
github.com/devtron-labs/common-lib/blob-storage
github.com/devtron-labs/common-lib/constants
Expand Down Expand Up @@ -841,4 +841,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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
2 changes: 1 addition & 1 deletion common-lib/git-manager/GitCliManager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (impl *GitCliManagerImpl) Clone(gitContext GitContext, prj CiProjectDetails
logrus.Error("could not clone repo ", "msgMsg: ", msgMsg, " err: ", cErr)
return "", msgMsg, cErr
}
projectName := util.GetProjectName(prj.GitRepository)
projectName := util.GetGitRepoNameFromGitRepoUrl(prj.GitRepository)
projRootDir := filepath.Join(checkoutPath, projectName)

_, msgMsg, cErr = impl.moveFilesFromSourceToDestination(projRootDir, checkoutPath)
Expand Down
10 changes: 3 additions & 7 deletions common-lib/git-manager/util/Util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,9 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) {
return parsedURL, err
}

// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only
// do not remove this function
func GetProjectName(url string) string {
//if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor
projName := strings.Split(url, ".")[1]
projectName := projName[strings.LastIndex(projName, "/")+1:]
return projectName
func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string {
gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:]
return strings.TrimSuffix(gitRepoUrl, ".git")
}

const DEVTRON = "DEVTRON"
4 changes: 2 additions & 2 deletions git-sensor/go.mod
View file
Open in desktop
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-20241121092824-79be1ba0e3da
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f

require (
github.com/caarlos0/env v3.5.0+incompatible
Expand Down Expand Up @@ -87,4 +87,4 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
mellium.im/sasl v0.3.1 // indirect
)
)
4 changes: 2 additions & 2 deletions git-sensor/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,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-20241121092824-79be1ba0e3da h1:wbqNhTahQp+c/htUfGxLtuzA0dddOcvdPtlSViKBJ70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f h1:Rw/PBejnZJIKj01tjcPSd1yhUUoAiWeGio/BOGeT0k0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ=
github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk=
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=
Expand Down
2 changes: 1 addition & 1 deletion git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go
View file
Open in desktop

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

10 changes: 3 additions & 7 deletions git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions git-sensor/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
## explicit; go 1.21
github.com/devtron-labs/common-lib/constants
github.com/devtron-labs/common-lib/git-manager
Expand Down Expand Up @@ -487,4 +487,4 @@ gopkg.in/yaml.v3
# mellium.im/sasl v0.3.1
## explicit; go 1.18
mellium.im/sasl
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
2 changes: 1 addition & 1 deletion image-scanner/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ require (
mellium.im/sasl v0.3.1 // indirect
)

replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
4 changes: 2 additions & 2 deletions image-scanner/go.sum
View file
Open in desktop
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-20241121092824-79be1ba0e3da h1:wbqNhTahQp+c/htUfGxLtuzA0dddOcvdPtlSViKBJ70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f h1:Rw/PBejnZJIKj01tjcPSd1yhUUoAiWeGio/BOGeT0k0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
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
2 changes: 1 addition & 1 deletion image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go
View file
Open in desktop

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

10 changes: 3 additions & 7 deletions image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions image-scanner/vendor/modules.txt
View file
Open in desktop
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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
## explicit; go 1.21
github.com/devtron-labs/common-lib/constants
github.com/devtron-labs/common-lib/git-manager
Expand Down Expand Up @@ -438,4 +438,4 @@ google.golang.org/protobuf/types/known/wrapperspb
# mellium.im/sasl v0.3.1
## explicit; go 1.18
mellium.im/sasl
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
2 changes: 1 addition & 1 deletion kubelink/go.mod
View file
Open in desktop
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-20241121092824-79be1ba0e3da
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
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
View file
Open in desktop
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-20241121092824-79be1ba0e3da h1:wbqNhTahQp+c/htUfGxLtuzA0dddOcvdPtlSViKBJ70=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f h1:Rw/PBejnZJIKj01tjcPSd1yhUUoAiWeGio/BOGeT0k0=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
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
10 changes: 3 additions & 7 deletions kubelink/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions kubelink/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
## explicit; go 1.21
github.com/devtron-labs/common-lib/async
github.com/devtron-labs/common-lib/constants
Expand Down Expand Up @@ -1353,7 +1353,7 @@ 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-20241121092824-79be1ba0e3da
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
# go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0
# k8s.io/api => k8s.io/api v0.29.0
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
Expand Down
2 changes: 1 addition & 1 deletion kubewatch/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,4 @@ replace (
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7
)

replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241121092824-79be1ba0e3da
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241202083047-d726745ee21f
Loading
Loading