Skip to content

vendor: bump openshift/api to pick up Insights capability #812

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

Closed
rluders wants to merge 1 commit into from
Closed

vendor: bump openshift/api to pick up Insights capability #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions 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-20220504105152-6f735e7109c8
github.com/openshift/api v0.0.0-20220802140642-dc2694e95008
github.com/openshift/client-go v0.0.0-20220504114320-6aec01bb0754
github.com/openshift/library-go v0.0.0-20220523142556-5bcfed822fc6
github.com/pkg/errors v0.9.1
Expand All @@ -20,11 +20,11 @@ require (
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
gopkg.in/fsnotify.v1 v1.4.7
k8s.io/api v0.23.0
k8s.io/api v0.24.0
k8s.io/apiextensions-apiserver v0.23.0
k8s.io/apimachinery v0.23.0
k8s.io/apimachinery v0.24.0
k8s.io/client-go v0.23.0
k8s.io/klog/v2 v2.30.0
k8s.io/klog/v2 v2.60.1
k8s.io/kube-aggregator v0.23.0
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
)
40 changes: 30 additions & 10 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

63 changes: 63 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 @@ -36,11 +36,37 @@ func TestSetCapabilities(t *testing.T) {
},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{},
},
{name: "set capabilities 4_12",
config: &configv1.ClusterVersion{
Spec: configv1.ClusterVersionSpec{
Capabilities: &configv1.ClusterVersionCapabilitiesSpec{
BaselineCapabilitySet: configv1.ClusterVersionCapabilitySet4_12,
AdditionalEnabledCapabilities: []configv1.ClusterVersionCapability{},
},
},
},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
},
{name: "set capabilities 4_11",
config: &configv1.ClusterVersion{
Spec: configv1.ClusterVersionSpec{
Expand All @@ -52,6 +78,8 @@ func TestSetCapabilities(t *testing.T) {
},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
Expand All @@ -72,11 +100,15 @@ func TestSetCapabilities(t *testing.T) {
},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
Expand All @@ -92,11 +124,40 @@ func TestSetCapabilities(t *testing.T) {
},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
},
{name: "set capabilities 4_12 with additional",
config: &configv1.ClusterVersion{
Spec: configv1.ClusterVersionSpec{
Capabilities: &configv1.ClusterVersionCapabilitiesSpec{
BaselineCapabilitySet: configv1.ClusterVersionCapabilitySet4_12,
AdditionalEnabledCapabilities: []configv1.ClusterVersionCapability{"cap1", "cap2", "cap3"},
},
},
},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
"cap1",
"cap2",
"cap3",
},
},
{name: "set capabilities 4_11 with additional",
config: &configv1.ClusterVersion{
Spec: configv1.ClusterVersionSpec{
Expand All @@ -108,6 +169,8 @@ func TestSetCapabilities(t *testing.T) {
},
wantKnownKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityConsole),
string(configv1.ClusterVersionCapabilityInsights),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
},
Expand Down
9 changes: 5 additions & 4 deletions pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ import (
clientset "github.com/openshift/client-go/config/clientset/versioned"
configinformersv1 "github.com/openshift/client-go/config/informers/externalversions/config/v1"
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
"github.com/openshift/library-go/pkg/manifest"
"github.com/openshift/library-go/pkg/verify"
"github.com/openshift/library-go/pkg/verify/store/configmap"
"github.com/openshift/library-go/pkg/verify/store/sigstore"

"github.com/openshift/cluster-version-operator/lib/capability"
"github.com/openshift/cluster-version-operator/lib/resourcebuilder"
"github.com/openshift/cluster-version-operator/lib/validation"
Expand All @@ -39,10 +44,6 @@ import (
"github.com/openshift/cluster-version-operator/pkg/payload"
"github.com/openshift/cluster-version-operator/pkg/payload/precondition"
preconditioncv "github.com/openshift/cluster-version-operator/pkg/payload/precondition/clusterversion"
"github.com/openshift/library-go/pkg/manifest"
"github.com/openshift/library-go/pkg/verify"
"github.com/openshift/library-go/pkg/verify/store/configmap"
"github.com/openshift/library-go/pkg/verify/store/sigstore"
)

const (
Expand Down
4 changes: 3 additions & 1 deletion pkg/cvo/internal/generic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"

"github.com/google/go-cmp/cmp"

"github.com/openshift/cluster-version-operator/lib/resourceapply"

apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand All @@ -15,9 +16,10 @@ import (
"k8s.io/klog/v2"

"github.com/openshift/client-go/config/clientset/versioned/scheme"
"github.com/openshift/library-go/pkg/manifest"

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

// readUnstructuredV1OrDie reads operatorstatus object from bytes. Panics on error.
Expand Down
3 changes: 2 additions & 1 deletion pkg/cvo/internal/operatorstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import (
configv1 "github.com/openshift/api/config/v1"
configclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"

"github.com/openshift/library-go/pkg/manifest"

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

var (
Expand Down
203 changes: 203 additions & 0 deletions vendor/github.com/google/gnostic/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading