Skip to content

Modify to use library-go manifest and verify packages #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Dec 6, 2020
Merged

Modify to use library-go manifest and verify packages #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2cfefb
Bump library-go to pick up packages manifest and verify
jottofar Aug 25, 2020
ce2874f
Modify to use library-go manifest and verify packages
jottofar Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,23 @@ require (
github.com/blang/semver/v4 v4.0.0
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
github.com/davecgh/go-spew v1.1.1
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/ghodss/yaml v1.0.0
github.com/google/uuid v1.1.1
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/openshift/api v0.0.0-20200724204552-3ae6754513d4
github.com/openshift/client-go v0.0.0-20200723130357-94e1065ab1f8
github.com/openshift/library-go v0.0.0-20200724192307-1ed21c4fa86c
github.com/openshift/api v0.0.0-20200827090112-c05698d102cf
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
github.com/openshift/library-go v0.0.0-20201013192036-5bd7c282e3e7
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_model v0.2.0
github.com/spf13/cobra v1.0.0
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
k8s.io/api v0.19.0-rc.2
k8s.io/apiextensions-apiserver v0.19.0-rc.2
k8s.io/apimachinery v0.19.0-rc.2
k8s.io/client-go v0.19.0-rc.2
k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/client-go v0.19.0
k8s.io/klog/v2 v2.3.0
k8s.io/kube-aggregator v0.19.0-rc.2
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
k8s.io/kube-aggregator v0.19.0
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
)
161 changes: 120 additions & 41 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

323 changes: 0 additions & 323 deletions lib/manifest_test.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions lib/resourcebuilder/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest"

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

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

// Mode is how this builder is being used.
type Mode int
Expand All @@ -81,7 +81,7 @@ type Interface interface {
}

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