Skip to content

Bump openshift/api to include new marketplace capability #757

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
Mar 28, 2022
Merged

Bump openshift/api to include new marketplace capability #757

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
f19e270
vendor: update openshift/api
njhale Mar 28, 2022
2151d8d
tests: add marketplace capability to unit tests
njhale Mar 28, 2022
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/google/go-cmp v0.5.5
github.com/google/uuid v1.1.2
github.com/imdario/mergo v0.3.8 // indirect
github.com/openshift/api v0.0.0-20220317153038-a2ca88c44400
github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
github.com/openshift/library-go v0.0.0-20211209153216-ed9bc958bd8a
github.com/pkg/errors v0.9.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ github.com/openshift/api v0.0.0-20220208222216-7e3ffb09accd h1:EaCz2jR4vZvtTBGXB
github.com/openshift/api v0.0.0-20220208222216-7e3ffb09accd/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
github.com/openshift/api v0.0.0-20220317153038-a2ca88c44400 h1:DMzrYI2PxPHFGQEWLSiHnAcF8l3wYDlGk1kUlEPhSC8=
github.com/openshift/api v0.0.0-20220317153038-a2ca88c44400/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53 h1:WpOfczPbuY5llRH94DJRsGTsgm7d8iAA2b7m0+YXAqI=
github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
Expand Down
51 changes: 43 additions & 8 deletions lib/capability/capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{},
},
{name: "set capabilities 4_11",
Expand All @@ -45,8 +49,16 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)},
wantEnabledKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
},
{name: "set capabilities vCurrent",
config: &configv1.ClusterVersion{
Expand All @@ -57,8 +69,16 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)},
wantEnabledKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
},
{name: "set capabilities None with additional",
config: &configv1.ClusterVersion{
Expand All @@ -69,7 +89,11 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
},
{name: "set capabilities 4_11 with additional",
Expand All @@ -81,8 +105,19 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)},
wantEnabledKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples), "cap1", "cap2", "cap3"},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
"cap1",
"cap2",
"cap3",
},
},
}
for _, test := range tests {
Expand Down
Loading