chore: k8s adapter

Author: Ash-exp

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.8.0
 	github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1
-	github.com/devtron-labs/common-lib v0.0.23-beta1
+	github.com/devtron-labs/common-lib v0.0.24-beta2
 	github.com/devtron-labs/go-bitbucket v0.9.60-beta
 	github.com/devtron-labs/protos v0.0.3-0.20240527113333-08a3be5ec6c1
 	github.com/evanphx/json-patch v5.7.0+incompatible

go.sum

@@ -197,8 +197,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1 h1:qdkpTAo2Kr0ZicZIVXfNwsGSshpc9OB9j9RzmKYdIwY=
 github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1/go.mod h1:IkKPPEfgLCMR29he5yv2OCC6iM2R7K5/0AA3k8b9XNc=
-github.com/devtron-labs/common-lib v0.0.23-beta1 h1:ZpFw4CETqjNpTdUKbE9oOq99s9cdF++cbmXLoJevGcA=
-github.com/devtron-labs/common-lib v0.0.23-beta1/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
+github.com/devtron-labs/common-lib v0.0.24-beta2 h1:DQFSgn3i9mZROff5TcYn3gZfRBdl7jftQRP02Pxy3wg=
+github.com/devtron-labs/common-lib v0.0.24-beta2/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20240527113333-08a3be5ec6c1 h1:R6qVeFaayqstBSu4w+ipWQqJyMKDqBVV3a11qoA2IaM=

pkg/deployment/manifest/ManifestCreationService.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 	application3 "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
-	util5 "github.com/devtron-labs/common-lib/utils/k8s"
+	k8sUtil "github.com/devtron-labs/common-lib/utils/k8s"
 	"github.com/devtron-labs/devtron/api/bean"
 	application2 "github.com/devtron-labs/devtron/client/argocdServer/application"
 	"github.com/devtron-labs/devtron/internal/sql/models"
@@ -52,7 +52,6 @@ import (
 	"github.com/tidwall/gjson"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"net/http"
 	"strings"
 	"time"
@@ -786,9 +785,21 @@ func (impl *ManifestCreationServiceImpl) getK8sHPAResourceManifest(ctx context.C
 	defer span.End()
 	resourceManifest := make(map[string]interface{})
 	version := "v2beta2"
-	k8sResource, err := impl.k8sCommonService.GetResource(newCtx, &k8s.ResourceRequestBean{ClusterId: clusterId,
-		K8sRequest: &util5.K8sRequestBean{ResourceIdentifier: util5.ResourceIdentifier{Name: hpaResourceRequest.ResourceName,
-			Namespace: namespace, GroupVersionKind: schema.GroupVersionKind{Group: hpaResourceRequest.Group, Kind: hpaResourceRequest.Kind, Version: version}}}})
+	k8sReq := &k8s.ResourceRequestBean{
+		ClusterId: clusterId,
+		K8sRequest: k8sUtil.NewK8sRequestBean(
+			k8sUtil.WithResourceIdentifier(
+				k8sUtil.NewResourceIdentifier(
+					k8sUtil.WithName(hpaResourceRequest.ResourceName),
+					k8sUtil.WithNameSpace(namespace),
+					k8sUtil.WithGroup(hpaResourceRequest.Group),
+					k8sUtil.WithKind(hpaResourceRequest.Kind),
+					k8sUtil.WithVersion(version),
+				),
+			),
+		),
+	}
+	k8sResource, err := impl.k8sCommonService.GetResource(newCtx, k8sReq)
 	if err != nil {
 		if k8s.IsResourceNotFoundErr(err) {
 			// this is a valid case for hibernated applications, so returning nil

vendor/github.com/devtron-labs/common-lib/async/async.go

@@ -402,7 +402,7 @@ github.com/devtron-labs/authenticator/jwt
 github.com/devtron-labs/authenticator/middleware
 github.com/devtron-labs/authenticator/oidc
 github.com/devtron-labs/authenticator/password
-# github.com/devtron-labs/common-lib v0.0.23-beta1
+# github.com/devtron-labs/common-lib v0.0.24-beta2
 ## explicit; go 1.21
 github.com/devtron-labs/common-lib/async
 github.com/devtron-labs/common-lib/blob-storage