From 27687ca42a46cae83556eeca9a2300719db86a45 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 18 Dec 2024 17:06:38 +0530 Subject: [PATCH 01/14] label propagate in buildx --- ci-runner/helper/DockerHelper.go | 15 +++++++++++---- ci-runner/helper/EventHelper.go | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index de4081849..be59ac6d9 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -344,7 +344,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s } useBuildxK8sDriver, eligibleK8sDriverNodes = dockerBuildConfig.CheckForBuildXK8sDriver() if useBuildxK8sDriver { - err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) + err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, ciRequest.AppLabels, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) if err != nil { log.Println(util.DEVTRON, " error in creating buildxDriver , err : ", err.Error()) return err @@ -938,14 +938,14 @@ func (impl *DockerHelperImpl) createBuildxBuilderForMultiArchBuild(ciContext cic return nil } -func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { +func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection string, appLabels map[string]string, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { if len(builderNodes) == 0 { return errors.New("atleast one node is expected for builder with kubernetes driver") } deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, appLabels, ciPipelineId, ciWorkflowId) deploymentNames = append(deploymentNames, deploymentName) // first node is used as default node, we create builder with --use flag, then we append other nodes if i == 0 { @@ -1017,7 +1017,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { +func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts, labels map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1030,6 +1030,13 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate = fmt.Sprintf(buildxCreate, platforms) } driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) + // add driver options for app labels + if len(labels) > 0 { + driverOpts["driverOptions"] += ",labels=" + for k, v := range labels { + driverOpts["driverOptions"] += fmt.Sprintf("%s=%s,", k, v) + } + } if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " buildxCreate = fmt.Sprintf(buildxCreate, driverOpts["driverOptions"]) diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index d492a100b..2879c6690 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -137,6 +137,7 @@ type CommonWorkflowRequest struct { PostCiSteps []*StepObject `json:"postCiSteps"` RefPlugins []*RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` + AppLabels map[string]string `json:"appLabels"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` CiBuildDockerMtuValue int `json:"ciBuildDockerMtuValue"` From 6a3665f16cddf7c3e3423fbf40572f8bb0eafb55 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 18 Dec 2024 18:57:43 +0530 Subject: [PATCH 02/14] fix --- ci-runner/helper/DockerHelper.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index be59ac6d9..326ffcba2 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1029,14 +1029,16 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate += " --platform=%s " buildxCreate = fmt.Sprintf(buildxCreate, platforms) } - driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) // add driver options for app labels if len(labels) > 0 { - driverOpts["driverOptions"] += ",labels=" + driverOpts["driverOptions"] += "\"labels=" for k, v := range labels { driverOpts["driverOptions"] += fmt.Sprintf("%s=%s,", k, v) } + driverOpts["driverOptions"] = strings.TrimSuffix(driverOpts["driverOptions"], ",") + driverOpts["driverOptions"] += "\"" } + driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " buildxCreate = fmt.Sprintf(buildxCreate, driverOpts["driverOptions"]) From ce4a8eaf762e2a905a7ae1766ef389bb1601c742 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 18 Dec 2024 19:51:07 +0530 Subject: [PATCH 03/14] fix --- ci-runner/helper/DockerHelper.go | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 326ffcba2..17f43ae83 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1030,14 +1030,7 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate = fmt.Sprintf(buildxCreate, platforms) } // add driver options for app labels - if len(labels) > 0 { - driverOpts["driverOptions"] += "\"labels=" - for k, v := range labels { - driverOpts["driverOptions"] += fmt.Sprintf("%s=%s,", k, v) - } - driverOpts["driverOptions"] = strings.TrimSuffix(driverOpts["driverOptions"], ",") - driverOpts["driverOptions"] += "\"" - } + driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabels(labels, driverOpts["driverOptions"]) driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " @@ -1063,6 +1056,27 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st return driverOptions } +func getBuildXDriverOptionsWithLabels(labels map[string]string, driverOptions string) string { + if len(labels) > 0 { + // creating label options + labelOptions := "" + labelOptions += "\"labels=" + for k, v := range labels { + labelOptions += fmt.Sprintf("%s=%s,", k, v) + } + labelOptions = strings.TrimSuffix(labelOptions, ",") + labelOptions += "\"" + + if len(driverOptions) > 0 { + driverOptions += fmt.Sprintf(",%s", labelOptions) + } else { + driverOptions = labelOptions + } + } + return driverOptions + +} + func (impl *DockerHelperImpl) StopDocker(ciContext cicxt.CiContext) error { cmd := exec.Command("docker", "ps", "-a", "-q") out, err := cmd.Output() From d399bafd810faa2030b27080130969441d4afb3f Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 19 Dec 2024 20:14:34 +0530 Subject: [PATCH 04/14] fix --- ci-runner/helper/DockerHelper.go | 76 ++++++++++++++++++++++++-------- ci-runner/helper/EventHelper.go | 1 - 2 files changed, 58 insertions(+), 19 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 17f43ae83..75eecec4f 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -344,7 +344,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s } useBuildxK8sDriver, eligibleK8sDriverNodes = dockerBuildConfig.CheckForBuildXK8sDriver() if useBuildxK8sDriver { - err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, ciRequest.AppLabels, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) + err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) if err != nil { log.Println(util.DEVTRON, " error in creating buildxDriver , err : ", err.Error()) return err @@ -938,14 +938,14 @@ func (impl *DockerHelperImpl) createBuildxBuilderForMultiArchBuild(ciContext cic return nil } -func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection string, appLabels map[string]string, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { +func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { if len(builderNodes) == 0 { return errors.New("atleast one node is expected for builder with kubernetes driver") } deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, appLabels, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) deploymentNames = append(deploymentNames, deploymentName) // first node is used as default node, we create builder with --use flag, then we append other nodes if i == 0 { @@ -1017,7 +1017,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts, labels map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { +func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1029,8 +1029,9 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate += " --platform=%s " buildxCreate = fmt.Sprintf(buildxCreate, platforms) } - // add driver options for app labels - driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabels(labels, driverOpts["driverOptions"]) + // add driver options for app labels and annotations + driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " @@ -1056,25 +1057,64 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st return driverOptions } -func getBuildXDriverOptionsWithLabels(labels map[string]string, driverOptions string) string { - if len(labels) > 0 { - // creating label options - labelOptions := "" - labelOptions += "\"labels=" - for k, v := range labels { - labelOptions += fmt.Sprintf("%s=%s,", k, v) +func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string { + labels := make(map[string]string) + annotations := make(map[string]string) + + // Read labels and annotations from files + labelsOut, err := os.ReadFile("/etc/podinfo/labels") + if err != nil { + log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) + } + annotationsOut, err := os.ReadFile("/etc/podinfo/annotations") + if err != nil { + log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) + } + + // Parse labels and annotations + if len(labelsOut) > 0 { + labels = parseKeyValuePairs(string(labelsOut)) + } + if len(annotationsOut) > 0 { + annotations = parseKeyValuePairs(string(annotationsOut)) + } + + // Combine driver options + driverOptions = getBuildXDriverOptions("labels", labels, driverOptions) + driverOptions = getBuildXDriverOptions("annotations", annotations, driverOptions) + return driverOptions +} + +func parseKeyValuePairs(input string) map[string]string { + keyValuePairs := make(map[string]string) + lines := strings.Split(input, "\n") + for _, line := range lines { + if len(line) > 0 { + kv := strings.SplitN(line, "=", 2) + if len(kv) == 2 { + keyValuePairs[kv[0]] = kv[1] + } } - labelOptions = strings.TrimSuffix(labelOptions, ",") - labelOptions += "\"" + } + return keyValuePairs +} + +func getBuildXDriverOptions(optionType string, options map[string]string, driverOptions string) string { + if len(options) > 0 { + optionStr := fmt.Sprintf("\"%s=", optionType) + for k, v := range options { + optionStr += fmt.Sprintf("%s=%s,", k, v) + } + optionStr = strings.TrimSuffix(optionStr, ",") + optionStr += "\"" if len(driverOptions) > 0 { - driverOptions += fmt.Sprintf(",%s", labelOptions) + driverOptions += fmt.Sprintf(",%s", optionStr) } else { - driverOptions = labelOptions + driverOptions = optionStr } } return driverOptions - } func (impl *DockerHelperImpl) StopDocker(ciContext cicxt.CiContext) error { diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 2879c6690..d492a100b 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -137,7 +137,6 @@ type CommonWorkflowRequest struct { PostCiSteps []*StepObject `json:"postCiSteps"` RefPlugins []*RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` - AppLabels map[string]string `json:"appLabels"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` CiBuildDockerMtuValue int `json:"ciBuildDockerMtuValue"` From 129348cb2332ff82da3bcff36c0afffcba3bc879 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 19 Dec 2024 20:40:01 +0530 Subject: [PATCH 05/14] fix --- ci-runner/helper/DockerHelper.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 75eecec4f..35e142cbb 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1092,7 +1092,9 @@ func parseKeyValuePairs(input string) map[string]string { if len(line) > 0 { kv := strings.SplitN(line, "=", 2) if len(kv) == 2 { - keyValuePairs[kv[0]] = kv[1] + key := kv[0] + value := strings.Trim(kv[1], `"`) + keyValuePairs[key] = value } } } From 9025eb41c6f980d5e13ade8c71571747f439a3f3 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 20 Dec 2024 15:57:50 +0530 Subject: [PATCH 06/14] fixDEVTRON_SELF_DOWNWARD_API_VOLUME_PATH added --- common-lib/utils/CommonUtils.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common-lib/utils/CommonUtils.go b/common-lib/utils/CommonUtils.go index 1a6c8307c..e65290e3a 100644 --- a/common-lib/utils/CommonUtils.go +++ b/common-lib/utils/CommonUtils.go @@ -32,9 +32,11 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" ) // Generates random string From f61a1734c0f4f7dc35c70915c2cf3745f18fa728 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 20 Dec 2024 16:03:39 +0530 Subject: [PATCH 07/14] path in constant --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/helper/DockerHelper.go | 6 ++++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 8 +++++--- ci-runner/vendor/modules.txt | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 6621f093d..63c9937f2 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -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-20241216105957-d5a37695c2b2 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 27090f5a6..2f944ba01 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -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-20241216105957-d5a37695c2b2 h1:WuQfIhux7jEQpJZ6I6JbRbsn7j9R3FANedWNhmetirM= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241216105957-d5a37695c2b2/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 h1:17fKsPL2gpSu1EoHkfFM5sluuQa2BpmtrzwX/0vq504= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9/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= diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 35e142cbb..57ae03b67 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1062,11 +1062,13 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string annotations := make(map[string]string) // Read labels and annotations from files - labelsOut, err := os.ReadFile("/etc/podinfo/labels") + labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/labels" + labelsOut, err := os.ReadFile(labelsPath) if err != nil { log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) } - annotationsOut, err := os.ReadFile("/etc/podinfo/annotations") + annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/annotations" + annotationsOut, err := os.ReadFile(annotationsPath) if err != nil { log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) } diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 1a6c8307c..e65290e3a 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -32,9 +32,11 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" ) // Generates random string diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 0d1e82ceb..2ba927476 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -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-20241216105957-d5a37695c2b2 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -842,4 +842,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-20241216105957-d5a37695c2b2 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 From caecad971809f2a2d581d42c4577a93c9aa9782e Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 09:56:57 +0530 Subject: [PATCH 08/14] constants --- ci-runner/helper/DockerHelper.go | 8 ++++---- common-lib/utils/CommonUtils.go | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 57ae03b67..5aad857a2 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1062,12 +1062,12 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string annotations := make(map[string]string) // Read labels and annotations from files - labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/labels" + labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_LABELS labelsOut, err := os.ReadFile(labelsPath) if err != nil { log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) } - annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/annotations" + annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS annotationsOut, err := os.ReadFile(annotationsPath) if err != nil { log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) @@ -1082,8 +1082,8 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string } // Combine driver options - driverOptions = getBuildXDriverOptions("labels", labels, driverOptions) - driverOptions = getBuildXDriverOptions("annotations", annotations, driverOptions) + driverOptions = getBuildXDriverOptions(utils.POD_LABELS, labels, driverOptions) + driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) return driverOptions } diff --git a/common-lib/utils/CommonUtils.go b/common-lib/utils/CommonUtils.go index b8e4084ef..433803400 100644 --- a/common-lib/utils/CommonUtils.go +++ b/common-lib/utils/CommonUtils.go @@ -41,6 +41,8 @@ const ( DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string From c8fd025211ca8d4a758225536af54cbaa5b38158 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 10:28:51 +0530 Subject: [PATCH 09/14] error handling in IO --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 +- ci-runner/helper/DockerHelper.go | 48 ++++++++++++++----- .../common-lib/utils/CommonUtils.go | 2 + ci-runner/vendor/modules.txt | 4 +- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 41bb9b0ca..39488a192 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -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-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 2ef26729e..3248b8fe5 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -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-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 h1:StPAZl4mjOlJ2Rhe00T+IUjfLvtJe6/0iDu77eJ5kfA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 5aad857a2..b7c0b4f84 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -945,7 +945,10 @@ func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.C deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName, err := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + if err != nil { + return err + } deploymentNames = append(deploymentNames, deploymentName) // first node is used as default node, we create builder with --use flag, then we append other nodes if i == 0 { @@ -957,7 +960,7 @@ func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.C fmt.Println(util.DEVTRON, " cmd : ", builderCmd) builderExecCmd := impl.GetCommandToExecute(builderCmd) - err := impl.cmdExecutor.RunCommand(ciContext, builderExecCmd) + err = impl.cmdExecutor.RunCommand(ciContext, builderExecCmd) if err != nil { fmt.Println(util.DEVTRON, " builderCmd : ", builderCmd, " err : ", err, " error : ") return err @@ -1017,7 +1020,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { +func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string, error) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1030,7 +1033,11 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate = fmt.Sprintf(buildxCreate, platforms) } // add driver options for app labels and annotations - driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + var err error + driverOpts["driverOptions"], err = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + if err != nil { + return "", "", err + } driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { @@ -1042,7 +1049,7 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildkitToml = fmt.Sprintf("--config %s", BuildkitdConfigPath) } buildxCreate = fmt.Sprintf("%s %s", buildxCreate, buildkitToml) - return buildxCreate, nodeName + return buildxCreate, nodeName, nil } func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) string { @@ -1057,20 +1064,20 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st return driverOptions } -func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string { +func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) (string, error) { labels := make(map[string]string) annotations := make(map[string]string) // Read labels and annotations from files labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_LABELS - labelsOut, err := os.ReadFile(labelsPath) + labelsOut, err := readFileAndLogErrors(labelsPath) if err != nil { - log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) + return "", err } annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS - annotationsOut, err := os.ReadFile(annotationsPath) + annotationsOut, err := readFileAndLogErrors(annotationsPath) if err != nil { - log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) + return "", err } // Parse labels and annotations @@ -1084,18 +1091,33 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string // Combine driver options driverOptions = getBuildXDriverOptions(utils.POD_LABELS, labels, driverOptions) driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) - return driverOptions + return driverOptions, nil +} + +func readFileAndLogErrors(filePath string) ([]byte, error) { + content, err := os.ReadFile(filePath) + if err != nil { + if errors.Is(err, os.ErrNotExist) { + log.Println(util.DEVTRON, "file not found at path:", filePath) + return content, nil + } else { + log.Println(util.DEVTRON, "IO error while reading file at path:", filePath, "err:", err) + return nil, err + } + } + return content, nil } func parseKeyValuePairs(input string) map[string]string { keyValuePairs := make(map[string]string) lines := strings.Split(input, "\n") for _, line := range lines { + line = strings.TrimSpace(line) if len(line) > 0 { kv := strings.SplitN(line, "=", 2) if len(kv) == 2 { - key := kv[0] - value := strings.Trim(kv[1], `"`) + key := strings.TrimSpace(kv[0]) + value := strings.Trim(strings.TrimSpace(kv[1]), `"`) keyValuePairs[key] = value } } diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index b8e4084ef..433803400 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -41,6 +41,8 @@ const ( DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index aa58e88ca..07528fe12 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -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-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,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-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 From 3d6ac9f538600e322f2f2a18f5f71991ce397494 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 14:20:10 +0530 Subject: [PATCH 10/14] sync --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 - ci-runner/vendor/modules.txt | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index fac59db38..fb85499ac 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -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-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index c8d9dedb8..a2a298100 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -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-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 h1:bEBayfPiDimFBnh16Sr5Ays7MkHnV7RmAhqVOix31gc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 433803400..24e05eb36 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -151,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 3e8b35333..57971261e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 From 7afad1ea96e92874eff53ef3b1c8b63d13bae590 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 14:24:45 +0530 Subject: [PATCH 11/14] common-lib sync --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- lens/vendor/modules.txt | 4 ++-- 27 files changed, 77 insertions(+), 59 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index c9d252c9f..c5fab584d 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -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-20250116095544-33cda6744e2e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 41ed51b1b..fe3500ed0 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -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-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 36645d97a..2de2f38b3 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index fb85499ac..69105bf2d 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -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-20250117084842-3c1000d0c5f9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index a2a298100..92843375d 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -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-20250117084842-3c1000d0c5f9 h1:bEBayfPiDimFBnh16Sr5Ays7MkHnV7RmAhqVOix31gc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 57971261e..4f72a983e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -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-20250117084842-3c1000d0c5f9 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,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-20250117084842-3c1000d0c5f9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 8cbe6bf7e..515894f71 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -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-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 838edbb65..4a4778065 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -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-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 0e4979c61..4a7f1a565 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index d729187f0..cd86a9b4b 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -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-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 4e9867a26..d7e8aad3b 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -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-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 0e3cf90f1..447cac4fc 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/kubelink/go.mod b/kubelink/go.mod index cc4c75bbc..76651ca16 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 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 diff --git a/kubelink/go.sum b/kubelink/go.sum index c3a42f0ba..4b20b7e4e 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -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-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 0794ceeb8..32975b949 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 # 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 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 25d5fa737..79212cd75 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -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-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 61698300d..60c4f39cc 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,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-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 7c77746a7..92de57e06 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/lens/go.mod b/lens/go.mod index 2255d42be..64ad8fa28 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/lens/go.sum b/lens/go.sum index bcc344fb3..479da65d3 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH 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-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb h1:CkfQQgZc950/hTPqtQSiHV2RmZgkBLGCzwR02FZYjAU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb/go.mod h1:pjLjgoa1GzbkOkvbMyP4SAKsaiK7eG6GoQCNauG03JA= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index e6d5d029e..6cfcc2ca6 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # 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-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 From 066a6172c073e8481e497b89a189306ec6fe3331 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 23 Jan 2025 05:11:18 +0530 Subject: [PATCH 12/14] annotations removed from buildx command --- ci-runner/helper/DockerHelper.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index b7c0b4f84..a81fc2433 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1065,32 +1065,35 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st } func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) (string, error) { + // not passing annotation as of now because --driver-opt=annotations is not supported by buildx if contains quotes labels := make(map[string]string) - annotations := make(map[string]string) - // Read labels and annotations from files + // Read labels from file labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_LABELS labelsOut, err := readFileAndLogErrors(labelsPath) if err != nil { return "", err } - annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS - annotationsOut, err := readFileAndLogErrors(annotationsPath) - if err != nil { - return "", err - } - // Parse labels and annotations + // Parse labels if len(labelsOut) > 0 { labels = parseKeyValuePairs(string(labelsOut)) } - if len(annotationsOut) > 0 { - annotations = parseKeyValuePairs(string(annotationsOut)) - } // Combine driver options driverOptions = getBuildXDriverOptions(utils.POD_LABELS, labels, driverOptions) - driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) + + //annotations := make(map[string]string) + //annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS + //annotationsOut, err := readFileAndLogErrors(annotationsPath) + //if err != nil { + // return "", err + //} + //if len(annotationsOut) > 0 { + // annotations = parseKeyValuePairs(string(annotationsOut)) + //} + //driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) + return driverOptions, nil } From a77d6124c15d0792670c5a24023c16669cbec3d4 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 23 Jan 2025 22:49:06 +0530 Subject: [PATCH 13/14] flag --- ci-runner/helper/DockerHelper.go | 16 +++++++++------- ci-runner/helper/EventHelper.go | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index a81fc2433..e5f440c15 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -344,7 +344,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s } useBuildxK8sDriver, eligibleK8sDriverNodes = dockerBuildConfig.CheckForBuildXK8sDriver() if useBuildxK8sDriver { - err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) + err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) if err != nil { log.Println(util.DEVTRON, " error in creating buildxDriver , err : ", err.Error()) return err @@ -938,14 +938,14 @@ func (impl *DockerHelperImpl) createBuildxBuilderForMultiArchBuild(ciContext cic return nil } -func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { +func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, ciRequest *CommonWorkflowRequest, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { if len(builderNodes) == 0 { return errors.New("atleast one node is expected for builder with kubernetes driver") } deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName, err := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName, err := getBuildxK8sDriverCmd(ciRequest, dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) if err != nil { return err } @@ -1020,7 +1020,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string, error) { +func getBuildxK8sDriverCmd(ciRequest *CommonWorkflowRequest, dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string, error) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1034,9 +1034,11 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt } // add driver options for app labels and annotations var err error - driverOpts["driverOptions"], err = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) - if err != nil { - return "", "", err + if ciRequest.PropagateLabelsInBuildxPod { + driverOpts["driverOptions"], err = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + if err != nil { + return "", "", err + } } driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 06c8ebfea..87595335b 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -162,6 +162,7 @@ type CommonWorkflowRequest struct { ImageScanRetryDelay int `json:"imageScanRetryDelay,omitempty"` ShouldPullDigest bool `json:"shouldPullDigest,omitempty"` EnableSecretMasking bool `json:"enableSecretMasking"` + PropagateLabelsInBuildxPod bool `json:"propagateLabelsInBuildxPod"` // Data from CD Workflow service WorkflowRunnerId int `json:"workflowRunnerId"` CdPipelineId int `json:"cdPipelineId"` From 7dfda79a8c7c1483596adf72955fa7c969cbee64 Mon Sep 17 00:00:00 2001 From: Rajeev Date: Mon, 27 Jan 2025 13:16:28 +0530 Subject: [PATCH 14/14] executed make with feat branch --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index e43b3c293..546c03ea5 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -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-20250124110806-5242f640f4e7 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index b5250dcf8..17edd94f5 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -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-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index d107e8d46..5ba93f7c3 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 43eb539c6..daa2a6d80 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -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-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 19346ebf7..b8f18ec3d 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -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-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 32ea31383..27555820e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/git-sensor/go.mod b/git-sensor/go.mod index e674706eb..2d10405de 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -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-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index dd9f884f2..c46451006 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -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-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 4832bdbdc..f51c774b6 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/image-scanner/go.mod b/image-scanner/go.mod index cde7d810e..02b7bd9ac 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -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-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 29bbf448c..b32897f1d 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -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-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index eefbc9dd4..d9ffec318 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/kubelink/go.mod b/kubelink/go.mod index 31f48b1d0..3f97b42b0 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd 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 diff --git a/kubelink/go.sum b/kubelink/go.sum index e4e280e9a..f392f0063 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -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-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 8837e9072..ceefba27e 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd # 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 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index b27922f09..5699ae84e 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -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-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/kubewatch/go.sum b/kubewatch/go.sum index f15340b9b..a45e18ad3 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,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-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 67a92650a..e3ecf42c7 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/lens/go.mod b/lens/go.mod index 381a3a729..d75e7e164 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/lens/go.sum b/lens/go.sum index 5d795ed5c..666f294ed 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH 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-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb h1:CkfQQgZc950/hTPqtQSiHV2RmZgkBLGCzwR02FZYjAU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb/go.mod h1:pjLjgoa1GzbkOkvbMyP4SAKsaiK7eG6GoQCNauG03JA= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index e9b039f3e..9ebbfe386 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # 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-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd