Skip to content

Commit 84b3884

Browse files
Merge pull request #443 from jottofar/ota-190-library-go-reuse
Modify to use library-go manifest and verify packages
2 parents dc6f4f0 + ce2874f commit 84b3884

File tree

103 files changed

+779
-1999
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+779
-1999
lines changed

go.mod

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,23 @@ require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
88
github.com/davecgh/go-spew v1.1.1
9-
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
109
github.com/ghodss/yaml v1.0.0
1110
github.com/google/uuid v1.1.1
1211
github.com/hashicorp/golang-lru v0.5.3 // indirect
1312
github.com/imdario/mergo v0.3.8 // indirect
14-
github.com/openshift/api v0.0.0-20200724204552-3ae6754513d4
15-
github.com/openshift/client-go v0.0.0-20200723130357-94e1065ab1f8
16-
github.com/openshift/library-go v0.0.0-20200724192307-1ed21c4fa86c
13+
github.com/openshift/api v0.0.0-20200827090112-c05698d102cf
14+
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
15+
github.com/openshift/library-go v0.0.0-20201013192036-5bd7c282e3e7
1716
github.com/pkg/errors v0.9.1
1817
github.com/prometheus/client_golang v1.7.1
1918
github.com/prometheus/client_model v0.2.0
2019
github.com/spf13/cobra v1.0.0
21-
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
2220
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
23-
k8s.io/api v0.19.0-rc.2
24-
k8s.io/apiextensions-apiserver v0.19.0-rc.2
25-
k8s.io/apimachinery v0.19.0-rc.2
26-
k8s.io/client-go v0.19.0-rc.2
21+
k8s.io/api v0.19.0
22+
k8s.io/apiextensions-apiserver v0.19.0
23+
k8s.io/apimachinery v0.19.0
24+
k8s.io/client-go v0.19.0
2725
k8s.io/klog/v2 v2.3.0
28-
k8s.io/kube-aggregator v0.19.0-rc.2
29-
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
26+
k8s.io/kube-aggregator v0.19.0
27+
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
3028
)

go.sum

Lines changed: 120 additions & 41 deletions
Large diffs are not rendered by default.

lib/manifest_test.go

Lines changed: 0 additions & 323 deletions
This file was deleted.

lib/resourcebuilder/interface.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"k8s.io/apimachinery/pkg/runtime/schema"
1111
"k8s.io/client-go/rest"
1212

13-
"github.com/openshift/cluster-version-operator/lib"
13+
"github.com/openshift/library-go/pkg/manifest"
1414
)
1515

1616
var (
@@ -62,7 +62,7 @@ type MetaV1ObjectModifierFunc func(metav1.Object)
6262
// NewInteraceFunc returns an Interface.
6363
// It requires rest Config that can be used to create a client
6464
// and the Manifest.
65-
type NewInteraceFunc func(rest *rest.Config, m lib.Manifest) Interface
65+
type NewInteraceFunc func(rest *rest.Config, m manifest.Manifest) Interface
6666

6767
// Mode is how this builder is being used.
6868
type Mode int
@@ -81,7 +81,7 @@ type Interface interface {
8181
}
8282

8383
// New returns Interface using the mapping stored in mapper for m Manifest.
84-
func New(mapper *ResourceMapper, rest *rest.Config, m lib.Manifest) (Interface, error) {
84+
func New(mapper *ResourceMapper, rest *rest.Config, m manifest.Manifest) (Interface, error) {
8585
f, ok := mapper.gvkToNew[m.GVK]
8686
if !ok {
8787
return nil, fmt.Errorf("No mapping found for gvk: %v", m.GVK)

0 commit comments

Comments
 (0)