Skip to content

Commit b49895a

Browse files
vikramdevtronvikramdevtron
authored
Merge pull request #157 from devtron-labs/release-candidate-v0.29.0
sync: Release candidate v0.29.0
2 parents 97063f7 + 4c91e68 commit b49895a

Some content is hidden

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

87 files changed

+3651
-1247
lines changed

‎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-20250130074656-5668b60f0966
8+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
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-20250130074656-5668b60f0966 h1:BjQI4rvtPiafv6Cpghjqn8QriZMfv09zqy2JIyzSg28=
58-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
57+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72 h1:hPVJuggt+zZjcf3PFaXy7ZrBV7VPB8+ztMVUErmHX3Y=
58+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
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/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-20250130074656-5668b60f0966
96+
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
9797
## explicit; go 1.21
9898
github.com/devtron-labs/common-lib/fetchAllEnv
9999
github.com/devtron-labs/common-lib/git-manager/util
@@ -790,4 +790,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
790790
# sigs.k8s.io/yaml v1.3.0
791791
## explicit; go 1.12
792792
sigs.k8s.io/yaml
793-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
793+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72

‎ci-runner/executor/stage/ciStages.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ func (impl *CiStage) HandleCIEvent(ciCdRequest *helper.CiCdTriggerEvent, exitCod
144144
return nil
145145
}
146146
err = util.ExecuteWithStageInfoLog(util.PUSH_CACHE, uploadCache)
147+
if err != nil {
148+
log.Println("error in cache push", err)
149+
}
147150
return
148151
}
149152

‎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-20250130074656-5668b60f0966
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
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
@@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
5757
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5858
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
5959
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
60-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966 h1:BjQI4rvtPiafv6Cpghjqn8QriZMfv09zqy2JIyzSg28=
61-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
60+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72 h1:hPVJuggt+zZjcf3PFaXy7ZrBV7VPB8+ztMVUErmHX3Y=
61+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
6262
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
6363
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
6464
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

‎ci-runner/helper/DockerHelper.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,11 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s
406406
}
407407

408408
if err = util.ExecuteWithStageInfoLogWithMetadata(util.DOCKER_BUILD, bean2.DockerBuildStageMetadata{TargetPlatforms: utils.ConvertTargetPlatformStringToObject(ciBuildConfig.DockerBuildConfig.TargetPlatform)}, buildImageStage); err != nil {
409-
return "", nil
409+
return "", err
410410
}
411411

412412
if buildxExportCacheFunc != nil {
413+
//todo do we need to throw error here? discuss
413414
util.ExecuteWithStageInfoLog(util.EXPORT_BUILD_CACHE, buildxExportCacheFunc)
414415
}
415416

@@ -470,7 +471,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s
470471
}
471472

472473
if err = util.ExecuteWithStageInfoLog(util.BUILD_PACK_BUILD, buildPacksImageBuildStage); err != nil {
473-
return "", nil
474+
return "", err
474475
}
475476

476477
}

‎ci-runner/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2
118118
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
119119
## explicit
120120
github.com/davecgh/go-spew/spew
121-
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
121+
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
122122
## explicit; go 1.21
123123
github.com/devtron-labs/common-lib/blob-storage
124124
github.com/devtron-labs/common-lib/constants
@@ -861,4 +861,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
861861
# sigs.k8s.io/yaml v1.3.0
862862
## explicit; go 1.12
863863
sigs.k8s.io/yaml
864-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
864+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72

‎common-lib/utils/k8s/K8sUtil.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ type K8sService interface {
144144
//below functions are exposed for K8sUtilExtended
145145
GetRestConfigByClusterWithoutCustomTransport(clusterConfig *ClusterConfig) (*rest.Config, error)
146146
OverrideRestConfigWithCustomTransport(restConfig *rest.Config) (*rest.Config, error)
147+
CreateNsWithLabels(namespace string, labels map[string]string, client *v12.CoreV1Client) (ns *v1.Namespace, err error)
147148
CreateNs(namespace string, client *v12.CoreV1Client) (ns *v1.Namespace, err error)
148149
}
149150

@@ -299,12 +300,12 @@ func (impl *K8sServiceImpl) CreateNsIfNotExists(namespace string, clusterConfig
299300
}
300301
ns, exists, err := impl.GetNsIfExists(namespace, v12Client)
301302
if err != nil {
302-
impl.logger.Errorw("error", "error", err, "clusterConfig", clusterConfig)
303+
impl.logger.Errorw("error", "error", err)
303304
return ns, false, err
304305
}
305306
if exists {
306307
nsCreated = false
307-
impl.logger.Infow("namesapce already exist")
308+
impl.logger.Infow("namespace already exist", "namespace", namespace)
308309
return ns, nsCreated, nil
309310
}
310311
impl.logger.Infow("ns not exists creating", "ns", namespace)
@@ -359,6 +360,17 @@ func (impl *K8sServiceImpl) CreateNs(namespace string, client *v12.CoreV1Client)
359360
}
360361
}
361362

363+
func (impl *K8sServiceImpl) CreateNsWithLabels(namespace string, labels map[string]string, client *v12.CoreV1Client) (ns *v1.Namespace, err error) {
364+
nsSpec := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: namespace, Labels: labels}}
365+
ns, err = client.Namespaces().Create(context.Background(), nsSpec, metav1.CreateOptions{})
366+
if err != nil {
367+
impl.logger.Errorw("error in creating ns", "err", err)
368+
return nil, err
369+
} else {
370+
return ns, nil
371+
}
372+
}
373+
362374
func (impl *K8sServiceImpl) deleteNs(namespace string, client *v12.CoreV1Client) error {
363375
err := client.Namespaces().Delete(context.Background(), namespace, metav1.DeleteOptions{})
364376
return err

‎git-sensor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN chmod +x /git-ask-pass.sh && \
2020
apk add openssh --no-cache && \
2121
adduser -D devtron
2222

23-
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/git-sensor/scripts/ /go/src/github.com/devtron-labs/git-sensor/git-sensor .
23+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/git-sensor/scripts/ /go/src/github.com/devtron-labs/git-sensor/git-sensor ./
2424

2525
USER devtron
2626

‎git-sensor/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.22.4
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
88

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

‎git-sensor/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
2929
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3030
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3131
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
32-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966 h1:BjQI4rvtPiafv6Cpghjqn8QriZMfv09zqy2JIyzSg28=
33-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
32+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72 h1:hPVJuggt+zZjcf3PFaXy7ZrBV7VPB8+ztMVUErmHX3Y=
33+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
3434
github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ=
3535
github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk=
3636
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

‎git-sensor/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin
6262
# github.com/davecgh/go-spew v1.1.1
6363
## explicit
6464
github.com/davecgh/go-spew/spew
65-
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
65+
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
6666
## explicit; go 1.21
6767
github.com/devtron-labs/common-lib/constants
6868
github.com/devtron-labs/common-lib/fetchAllEnv
@@ -485,4 +485,4 @@ gopkg.in/yaml.v3
485485
# mellium.im/sasl v0.3.2
486486
## explicit; go 1.20
487487
mellium.im/sasl
488-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
488+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72

‎image-scanner/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ require (
7474
mellium.im/sasl v0.3.2 // indirect
7575
)
7676

77-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
77+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72

‎image-scanner/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
280280
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
281281
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
282282
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
283-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966 h1:BjQI4rvtPiafv6Cpghjqn8QriZMfv09zqy2JIyzSg28=
284-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
283+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72 h1:hPVJuggt+zZjcf3PFaXy7ZrBV7VPB8+ztMVUErmHX3Y=
284+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
285285
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
286286
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
287287
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=

‎image-scanner/pkg/security/ImageScanService.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ func (impl *ImageScanServiceImpl) CreateFolderForOutputData(executionHistoryMode
270270
return executionHistoryDirPath
271271
}
272272

273-
func (impl *ImageScanServiceImpl) saveImageScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory, toolId int) error {
273+
func (impl *ImageScanServiceImpl) saveImageScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory, toolId int, executionMappingState bean.ScanExecutionProcessState) error {
274274
//creating execution history
275275
tx, err := impl.ScanHistoryRepository.GetConnection().Begin()
276276
if err != nil {
@@ -284,7 +284,7 @@ func (impl *ImageScanServiceImpl) saveImageScanExecutionHistoryAndState(executio
284284
impl.Logger.Errorw("Failed to save executionHistory", "model", executionHistoryModel, "err", err)
285285
return err
286286
}
287-
executionHistoryMappingModel := adaptor.GetScanToolExecutionHistoryMapping(executionHistoryModel, bean.ScanExecutionProcessStateCompleted, "", toolId)
287+
executionHistoryMappingModel := adaptor.GetScanToolExecutionHistoryMapping(executionHistoryModel, executionMappingState, "", toolId)
288288
err = impl.ScanToolExecutionHistoryMappingRepository.Save(tx, executionHistoryMappingModel)
289289
if err != nil {
290290
impl.Logger.Errorw("Failed to save executionHistoryMappingModel", "err", err)
@@ -301,7 +301,7 @@ func (impl *ImageScanServiceImpl) saveImageScanExecutionHistoryAndState(executio
301301
func (impl *ImageScanServiceImpl) RegisterScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory,
302302
toolId int) (*repository.ImageScanExecutionHistory, string, error) {
303303
executionHistoryDirPath := ""
304-
err := impl.saveImageScanExecutionHistoryAndState(executionHistoryModel, toolId)
304+
err := impl.saveImageScanExecutionHistoryAndState(executionHistoryModel, toolId, bean.ScanExecutionProcessStateRunning)
305305
if err != nil {
306306
impl.Logger.Errorw("error in saving image scan exec history and it's state", "executionHistoryModel", executionHistoryModel, "err", err)
307307
return nil, executionHistoryDirPath, err
@@ -1030,7 +1030,7 @@ func (impl *ImageScanServiceImpl) RegisterAndSaveScannedResult(scanResultPayload
10301030
return 0, err
10311031
}
10321032
executionHistoryModel := adaptor.GetImageScanExecutionHistory(scanResultPayload.ImageScanEvent, scanEventJson, time.Now())
1033-
err = impl.saveImageScanExecutionHistoryAndState(executionHistoryModel, scanResultPayload.ScanToolId)
1033+
err = impl.saveImageScanExecutionHistoryAndState(executionHistoryModel, scanResultPayload.ScanToolId, bean.ScanExecutionProcessStateCompleted)
10341034
if err != nil {
10351035
impl.Logger.Errorw("error in saving scan execution history and state mapping", "executionHistoryModel", executionHistoryModel, "toolId", scanResultPayload.ScanToolId, "err", err)
10361036
return 0, err

‎image-scanner/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2
7272
github.com/coreos/clair/api/v3/clairpb
7373
github.com/coreos/clair/database
7474
github.com/coreos/clair/ext/versionfmt
75-
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
75+
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
7676
## explicit; go 1.21
7777
github.com/devtron-labs/common-lib/constants
7878
github.com/devtron-labs/common-lib/fetchAllEnv
@@ -440,4 +440,4 @@ google.golang.org/protobuf/types/known/wrapperspb
440440
# mellium.im/sasl v0.3.2
441441
## explicit; go 1.20
442442
mellium.im/sasl
443-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
443+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72

‎kubelink/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ require (
177177
)
178178

179179
replace (
180-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966
180+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72
181181
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0
182182
// https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280
183183
k8s.io/api => k8s.io/api v0.29.0

‎kubelink/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
7979
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8080
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8181
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
82-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966 h1:BjQI4rvtPiafv6Cpghjqn8QriZMfv09zqy2JIyzSg28=
83-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250130074656-5668b60f0966/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
82+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72 h1:hPVJuggt+zZjcf3PFaXy7ZrBV7VPB8+ztMVUErmHX3Y=
83+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213074742-042aeadc9d72/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
8484
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
8585
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
8686
github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic=

‎kubelink/vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go

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

0 commit comments

Comments
 (0)