sync: Release candidate v0.39.0

chart-sync/go.mod

@@ -4,7 +4,7 @@ go 1.24.0
 
 toolchain go1.24.3
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c
 
 require (
 	github.com/caarlos0/env v3.5.0+incompatible

chart-sync/go.sum

@@ -43,8 +43,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-20250619100439-8e8e182b498a h1:iQdc02/QUQ4P45Y/OEZXtbkES6+Tan2RJfg2wpJxaWQ=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c h1:ZtYIPskOvOkdqU66dggJ1eUR7xoaAL5xhYliYm0iRww=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 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 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM=

chart-sync/vendor/modules.txt

@@ -95,7 +95,7 @@ github.com/containerd/platforms
 # 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.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a
+# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/constants
 github.com/devtron-labs/common-lib/fetchAllEnv
@@ -967,4 +967,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 sigs.k8s.io/yaml/goyaml.v3
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c

ci-runner/executor/StageExecutor.go

@@ -30,6 +30,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime/debug"
+	"strings"
 )
 
 type StageExecutorImpl struct {
@@ -225,6 +226,10 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest
 			stepOutputVarsFinal = stageOutputVars
 			if len(step.ArtifactPaths) > 0 {
 				for _, path := range step.ArtifactPaths {
+					if strings.HasPrefix(path, util.WORKINGDIR) {
+						log.Printf("skipping copying files to '/devtroncd' path as it's reserved")
+						continue
+					}
 					err = copylib.Copy(path, filepath.Join(util.TmpArtifactLocation, step.Name, path))
 					if err != nil {
 						if _, ok := err.(*os.PathError); ok {

ci-runner/go.mod

@@ -4,7 +4,7 @@ go 1.24.0
 
 toolchain go1.24.3
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c
 
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible

ci-runner/go.sum

@@ -114,8 +114,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-20250619100439-8e8e182b498a h1:iQdc02/QUQ4P45Y/OEZXtbkES6+Tan2RJfg2wpJxaWQ=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c h1:ZtYIPskOvOkdqU66dggJ1eUR7xoaAL5xhYliYm0iRww=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 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 v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k=

ci-runner/vendor/modules.txt

@@ -298,7 +298,7 @@ github.com/cncf/xds/go/xds/type/v3
 # 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.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a
+# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/blob-storage
 github.com/devtron-labs/common-lib/constants
@@ -1194,4 +1194,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250619100439-8e8e182b498a
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250704063028-ee904611f07c

common-lib/constants/constants.go

@@ -30,11 +30,12 @@ func (m ServiceName) ToString() string {
 }
 
 const (
-	Orchestrator ServiceName = "ORCHESTRATOR"
-	Kubelink     ServiceName = "KUBELINK"
-	GitSensor    ServiceName = "GITSENSOR"
-	Kubewatch    ServiceName = "KUBEWATCH"
-	ImageScanner ServiceName = "IMAGE_SCANNER"
+	Orchestrator      ServiceName = "ORCHESTRATOR"
+	Kubelink          ServiceName = "KUBELINK"
+	GitSensor         ServiceName = "GITSENSOR"
+	Kubewatch         ServiceName = "KUBEWATCH"
+	ImageScanner      ServiceName = "IMAGE_SCANNER"
+	ResourceOptimizer ServiceName = "RESOURCE_OPTIMIZER"
 )
 
 // metrics name constants

common-lib/k8sResource/bean.go

@@ -0,0 +1,197 @@
+package k8sResource
+
+import (
+	k8sCommonBean "github.com/devtron-labs/common-lib/utils/k8s/commonBean"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type Identifier struct {
+	gvk       schema.GroupVersionKind
+	name      string
+	namespace string
+}
+
+func NewIdentifier(name, namespace string, gvk schema.GroupVersionKind) *Identifier {
+	return &Identifier{
+		gvk:       gvk,
+		name:      name,
+		namespace: namespace,
+	}
+}
+
+func (identifier *Identifier) GetGvk() schema.GroupVersionKind {
+	if identifier == nil {
+		return schema.GroupVersionKind{}
+	}
+	return identifier.gvk
+}
+
+func (identifier *Identifier) GetName() string {
+	if identifier == nil {
+		return ""
+	}
+	return identifier.name
+}
+
+func (identifier *Identifier) GetNamespace() string {
+	if identifier == nil {
+		return ""
+	}
+	return identifier.namespace
+}
+
+type PatchRequest struct {
+	// TODO: Use Identifier instead of Name, Namespace, Gvk
+	Name      string
+	Namespace string
+	Gvk       *schema.GroupVersionKind
+	Patch     string
+	PatchType string
+}
+
+type ParentChildGvkMapping struct {
+	Group        string         `json:"group"`
+	Version      string         `json:"version"`
+	Kind         string         `json:"kind"`
+	ChildObjects []ChildObjects `json:"childObjects"`
+}
+
+type ChildObjects struct {
+	Group    string             `json:"group"`
+	Version  string             `json:"version"`
+	Resource string             `json:"resource"`
+	Scope    meta.RESTScopeName `json:"scope"`
+}
+
+func (r ChildObjects) GetGvrAndScopeForChildObject() *k8sCommonBean.GvrAndScope {
+	return &k8sCommonBean.GvrAndScope{
+		Gvr: schema.GroupVersionResource{
+			Group:    r.Group,
+			Version:  r.Version,
+			Resource: r.Resource,
+		},
+		Scope: r.Scope,
+	}
+}
+
+func (r ParentChildGvkMapping) GetParentGvk() schema.GroupVersionKind {
+	return schema.GroupVersionKind{
+		Group:   r.Group,
+		Version: r.Version,
+		Kind:    r.Kind,
+	}
+}
+
+type FilterChildrenObjectsResponse struct {
+	pvcs      []unstructured.Unstructured
+	manifests []*unstructured.Unstructured
+}
+
+func NewFilterChildrenObjectsResponse() *FilterChildrenObjectsResponse {
+	return &FilterChildrenObjectsResponse{}
+}
+
+func (resp *FilterChildrenObjectsResponse) GetPvcs() []unstructured.Unstructured {
+	return resp.pvcs
+}
+
+func (resp *FilterChildrenObjectsResponse) GetManifests() []*unstructured.Unstructured {
+	return resp.manifests
+}
+
+func (resp *FilterChildrenObjectsResponse) WithPVCs(pvcs []unstructured.Unstructured) *FilterChildrenObjectsResponse {
+	resp.pvcs = append(resp.pvcs, pvcs...)
+	return resp
+}
+
+func (resp *FilterChildrenObjectsResponse) WithManifest(manifest *unstructured.Unstructured) *FilterChildrenObjectsResponse {
+	if manifest == nil {
+		return resp
+	}
+	resp.manifests = append(resp.manifests, manifest)
+	return resp
+}
+
+type FilterChildrenObjectsRequest struct {
+	childGvk    schema.GroupVersionResource
+	pvcs        []unstructured.Unstructured
+	listObjects *unstructured.UnstructuredList
+	// TODO: Use Identifier instead of Name, Namespace, Gvk
+	namespace  string
+	parentGvk  schema.GroupVersionKind
+	parentName string
+}
+
+func (req *FilterChildrenObjectsRequest) IsChildResourceTypePVC() bool {
+	return req.GetParentGvk().Kind == k8sCommonBean.StatefulSetKind && req.GetChildGvk().Resource == k8sCommonBean.PersistentVolumeClaimsResourceType
+}
+
+func (req *FilterChildrenObjectsRequest) GetLoggerMetadata(keysAndValues ...any) []any {
+	metaData := []any{
+		"namespace", req.namespace,
+		"childGvk", req.childGvk,
+		"parentGvk", req.parentGvk,
+		"parentName", req.parentName,
+	}
+	return append(metaData, keysAndValues...)
+}
+
+func (req *FilterChildrenObjectsRequest) GetChildGvk() schema.GroupVersionResource {
+	return req.childGvk
+}
+
+func (req *FilterChildrenObjectsRequest) GetPvcs() []unstructured.Unstructured {
+	return req.pvcs
+}
+
+func (req *FilterChildrenObjectsRequest) GetListObjects() *unstructured.UnstructuredList {
+	return req.listObjects
+}
+
+func (req *FilterChildrenObjectsRequest) GetNamespace() string {
+	return req.namespace
+}
+
+func (req *FilterChildrenObjectsRequest) GetParentGvk() schema.GroupVersionKind {
+	return req.parentGvk
+}
+
+func (req *FilterChildrenObjectsRequest) GetParentName() string {
+	return req.parentName
+}
+
+func NewFilterChildrenObjectsRequest() *FilterChildrenObjectsRequest {
+	return &FilterChildrenObjectsRequest{}
+}
+
+func (req *FilterChildrenObjectsRequest) WithChildGvk(gvr schema.GroupVersionResource) *FilterChildrenObjectsRequest {
+	req.childGvk = gvr
+	return req
+}
+
+func (req *FilterChildrenObjectsRequest) WithPvcs(pvcs []unstructured.Unstructured) *FilterChildrenObjectsRequest {
+	req.pvcs = pvcs
+	return req
+}
+
+func (req *FilterChildrenObjectsRequest) WithListObjects(objects *unstructured.UnstructuredList) *FilterChildrenObjectsRequest {
+	req.listObjects = objects
+	return req
+}
+
+func (req *FilterChildrenObjectsRequest) WithNamespace(namespace string) *FilterChildrenObjectsRequest {
+	req.namespace = namespace
+	return req
+}
+
+func (req *FilterChildrenObjectsRequest) WithParentGvk(parentGvk schema.GroupVersionKind) *FilterChildrenObjectsRequest {
+	req.parentGvk = parentGvk
+	return req
+}
+
+func (req *FilterChildrenObjectsRequest) WithParentName(parentName string) *FilterChildrenObjectsRequest {
+	req.parentName = parentName
+	return req
+}

common-lib/k8sResource/config.go

@@ -0,0 +1,22 @@
+package k8sResource
+
+import "github.com/caarlos0/env"
+
+// CATEGORY=K8S_RESOURCE_SERVICE_CONFIG
+type ServiceConfig struct {
+	ParentChildGvkMapping      string `env:"PARENT_CHILD_GVK_MAPPING" envDefault:"" description:"Parent child GVK mapping for resource tree" deprecated:"false" example:""`
+	ChildObjectListingPageSize int64  `env:"CHILD_OBJECT_LISTING_PAGE_SIZE" envDefault:"1000" description:"Resource tree child object listing page size" deprecated:"false" example:"100"`
+}
+
+func GetK8sResourceConfig() (*ServiceConfig, error) {
+	cfg := &ServiceConfig{}
+	err := env.Parse(cfg)
+	if err != nil {
+		return cfg, err
+	}
+	if cfg.ChildObjectListingPageSize <= 10 {
+		// set the default value for invalid values
+		cfg.ChildObjectListingPageSize = 1000
+	}
+	return cfg, nil
+}