Skip to content

[CNF-5646] bump api version to add new capability #835

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 3 commits into from
Oct 11, 2022
Merged

[CNF-5646] bump api version to add new capability #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e64353
vendor: upgrade openshift/api
qJkee Sep 10, 2022
c5b0894
vendor: upgrade openshift/client-go
qJkee Sep 10, 2022
2fd7756
update tests with new capabilities
qJkee Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 20 additions & 20 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,45 @@ require (
github.com/blang/semver/v4 v4.0.0
github.com/davecgh/go-spew v1.1.1
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.5.5
github.com/google/go-cmp v0.5.6
github.com/google/uuid v1.1.2
github.com/imdario/mergo v0.3.8 // indirect
github.com/openshift/api v0.0.0-20220811160310-427c7cc57280
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
github.com/openshift/api v0.0.0-20220919112502-5eaf4250c423
github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e
github.com/openshift/library-go v0.0.0-20220823205642-e2ef049de560
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.1
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.32.1
github.com/spf13/cobra v1.4.0
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
golang.org/x/net v0.0.0-20220909164309-bea034e7d591
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
gopkg.in/fsnotify.v1 v1.4.7
k8s.io/api v0.24.0
k8s.io/api v0.25.0
k8s.io/apiextensions-apiserver v0.24.0
k8s.io/apimachinery v0.24.0
k8s.io/client-go v0.24.0
k8s.io/klog/v2 v2.60.1
k8s.io/apimachinery v0.25.0
k8s.io/client-go v0.25.0
k8s.io/klog/v2 v2.80.1
k8s.io/kube-aggregator v0.24.0
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
Expand All @@ -57,20 +57,20 @@ require (
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.24.0 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
77 changes: 40 additions & 37 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions lib/capability/capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
},
wantEnabledKeys: []string{},
},
Expand All @@ -60,6 +61,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand All @@ -83,6 +85,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand All @@ -91,6 +94,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
},
},
{name: "set capabilities None with additional",
Expand All @@ -109,6 +113,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
},
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
},
Expand All @@ -128,6 +133,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand Down
Loading