Merge pull request #13045 from maysunfaisal/update-devfile-3

ODC-7539: Update devfile library to v2.2.2

Author: openshift-merge-bot[bot]

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/coreos/pkg v0.0.0-20230601102743-20bbbf26f4d8
 	github.com/devfile/api/v2 v2.2.1
-	github.com/devfile/library v1.2.1-0.20221017204048-ec4b02cbe9c7
+	github.com/devfile/library/v2 v2.2.2-0.20240222173303-eefdbd323c45
 	github.com/devfile/registry-support/index/generator v0.0.0-20231020181239-1168591f0b4e
 	github.com/devfile/registry-support/registry-library v0.0.0-20231020181239-1168591f0b4e
 	github.com/golang/mock v1.6.0
@@ -34,7 +34,7 @@ require (
 	k8s.io/client-go v0.28.2
 	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.100.1
-	sigs.k8s.io/controller-runtime v0.14.4
+	sigs.k8s.io/controller-runtime v0.14.7
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -61,6 +61,7 @@ require (
 	github.com/containerd/containerd v1.7.6 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/distribution/distribution/v3 v3.0.0-20230511163743-f7717b7855ca // indirect
 	github.com/docker/cli v24.0.6+incompatible // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/docker v24.0.7+incompatible // indirect
@@ -207,6 +208,7 @@ require (
 	k8s.io/helm v2.17.0+incompatible // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/kubectl v0.28.2 // indirect
+	k8s.io/pod-security-admission v0.26.10 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	oras.land/oras-go v1.2.4 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

go.sum

@@ -10,8 +10,8 @@ import (
 	"github.com/openshift/console/pkg/serverutils"
 	"k8s.io/klog"
 
-	devfile "github.com/devfile/library/pkg/devfile"
-	"github.com/devfile/library/pkg/devfile/parser"
+	devfile "github.com/devfile/library/v2/pkg/devfile"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
 )
 
 func DevfileSamplesHandler(w http.ResponseWriter, r *http.Request) {

pkg/devfile/handler.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 
 	devfilev1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/generator"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/generator"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 
 	buildv1 "github.com/openshift/api/build/v1"
 	imagev1 "github.com/openshift/api/image/v1"
@@ -169,7 +169,7 @@ func GetResourceFromDevfile(devfileObj parser.DevfileObj, deployAssociatedCompon
 			src := parser.YamlSrc{
 				Data: []byte(component.Kubernetes.Inlined),
 			}
-			values, err := parser.ReadKubernetesYaml(src, nil)
+			values, err := parser.ReadKubernetesYaml(src, nil, nil)
 			if err != nil {
 				errMsg := fmt.Sprintf("Failed to read the Kubernetes yaml from devfile: %v", err)
 				klog.Error(errMsg)

pkg/devfile/resources.go

@@ -10,9 +10,9 @@ import (
 
 	buildv1 "github.com/openshift/api/build/v1"
 
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

pkg/devfile/resources_test.go

@@ -7,8 +7,8 @@ import (
 	"k8s.io/klog"
 
 	devfilev1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 )
 
 // GetImageBuildComponent gets the image build component from the deploy associated components

pkg/devfile/utils.go

@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	"github.com/golang/mock/gomock"
 )