Skip to content

Revert openshift/api bump PR merged by mistake (977) #978

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-ci merged 2 commits into from
Oct 3, 2023
Merged

Revert openshift/api bump PR merged by mistake (977) #978

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
9b348ce
Revert "vendor: bump openshift/api"
eggfoobar Oct 3, 2023
e41f21f
Revert "update tests with new capabilities"
eggfoobar Oct 3, 2023
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
  •  
  •  
  •  
56 changes: 27 additions & 29 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,66 +14,64 @@ require (
github.com/operator-framework/api v0.17.1
github.com/operator-framework/operator-lifecycle-manager v0.22.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
github.com/prometheus/common v0.44.0
github.com/spf13/cobra v1.7.0
golang.org/x/crypto v0.11.0
golang.org/x/net v0.13.0
golang.org/x/time v0.3.0
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
github.com/prometheus/common v0.37.0
github.com/spf13/cobra v1.6.1
golang.org/x/crypto v0.1.0
golang.org/x/net v0.8.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
gopkg.in/fsnotify.v1 v1.4.7
k8s.io/api v0.28.2
k8s.io/apiextensions-apiserver v0.28.2
k8s.io/apimachinery v0.28.2
k8s.io/client-go v0.28.2
k8s.io/klog/v2 v2.100.1
k8s.io/kube-aggregator v0.28.2
k8s.io/api v0.27.1
k8s.io/apiextensions-apiserver v0.27.1
k8s.io/apimachinery v0.27.1
k8s.io/client-go v0.27.1
k8s.io/klog/v2 v2.90.1
k8s.io/kube-aggregator v0.27.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // 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.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.28.2 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/apiserver v0.27.1 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
sigs.k8s.io/controller-runtime v0.12.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/openshift/api => github.com/qjkee/api v0.0.0-20231002115403-acf2a73a87b0
539 changes: 477 additions & 62 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions lib/capability/capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityCloudController),
},
wantEnabledKeys: []string{},
},
Expand All @@ -73,7 +72,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityCloudController),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand Down Expand Up @@ -104,7 +102,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityCloudController),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand All @@ -119,7 +116,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityCloudController),
},
},
{name: "set capabilities None with additional",
Expand All @@ -144,7 +140,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityCloudController),
},
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
},
Expand All @@ -170,7 +165,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityCloudController),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand Down
Loading