File tree 5 files changed +5
-9
lines changed
controllers/workspace/restapis
5 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -23,14 +23,14 @@ import (
23
23
"github.com/devfile/devworkspace-operator/pkg/config"
24
24
"github.com/google/go-cmp/cmp"
25
25
"github.com/google/go-cmp/cmp/cmpopts"
26
- "gopkg.in/yaml.v2"
27
26
corev1 "k8s.io/api/core/v1"
28
27
"k8s.io/apimachinery/pkg/api/errors"
29
28
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
30
29
k8sRuntime "k8s.io/apimachinery/pkg/runtime"
31
30
"k8s.io/apimachinery/pkg/types"
32
31
runtimeClient "sigs.k8s.io/controller-runtime/pkg/client"
33
32
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
33
+ "sigs.k8s.io/yaml"
34
34
)
35
35
36
36
var configmapDiffOpts = cmp.Options {
Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ require (
7
7
github.com/devfile/api v0.0.0-20200826083800-9e2280a95680
8
8
github.com/eclipse/che-go-jsonrpc v0.0.0-20200317130110-931966b891fe // indirect
9
9
github.com/eclipse/che-plugin-broker v3.4.0+incompatible
10
- github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
11
10
github.com/go-logr/logr v0.1.0
12
11
github.com/google/go-cmp v0.4.0
13
12
github.com/google/uuid v1.1.1
@@ -16,11 +15,11 @@ require (
16
15
github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
17
16
github.com/operator-framework/operator-sdk v0.17.0
18
17
github.com/stretchr/testify v1.6.1
19
- gopkg.in/yaml.v2 v2.3.0
20
18
k8s.io/api v0.18.6
21
19
k8s.io/apimachinery v0.18.6
22
20
k8s.io/client-go v12.0.0+incompatible
23
21
sigs.k8s.io/controller-runtime v0.6.2
22
+ sigs.k8s.io/yaml v1.2.0
24
23
)
25
24
26
25
// devfile/api requires v12.0.0+incompatible but this causes issues with go commands
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ import (
19
19
20
20
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
21
21
22
- "gopkg.in /yaml.v2 "
22
+ "sigs.k8s.io /yaml"
23
23
)
24
24
25
25
const (
Original file line number Diff line number Diff line change @@ -21,8 +21,8 @@ import (
21
21
22
22
"github.com/eclipse/che-plugin-broker/model"
23
23
brokerModel "github.com/eclipse/che-plugin-broker/model"
24
- "gopkg.in/yaml.v2"
25
24
logf "sigs.k8s.io/controller-runtime/pkg/log"
25
+ "sigs.k8s.io/yaml"
26
26
)
27
27
28
28
const (
Original file line number Diff line number Diff line change @@ -20,10 +20,7 @@ import (
20
20
21
21
"github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
22
22
"github.com/stretchr/testify/assert"
23
-
24
- // ghodss/yaml is required instead of the default gopkg.in/yaml.v2 since the latter
25
- // only supports yaml struct tags and the DevWorkspace API only uses json.
26
- "github.com/ghodss/yaml"
23
+ "sigs.k8s.io/yaml"
27
24
)
28
25
29
26
type testCase struct {
You can’t perform that action at this time.
0 commit comments