Skip to content

Revert "CNF-9385: add ImageRegistry capability" #956

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
dgoodwin wants to merge 1 commit into from
Closed

Revert "CNF-9385: add ImageRegistry capability" #956

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
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 @@ -8,7 +8,7 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/openshift/api v0.0.0-20230814190820-0a02300f203a
github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
github.com/openshift/library-go v0.0.0-20230622115850-9596e367bcb4
github.com/operator-framework/api v0.17.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=
github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
github.com/openshift/api v0.0.0-20230814190820-0a02300f203a h1:RfPfzkdpxYuuzgKn1SAGU/c+oL+wuniSqX3/iFxYPfM=
github.com/openshift/api v0.0.0-20230814190820-0a02300f203a/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs=
github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d h1:CZTZCcFRz7R7rvJhA+mreIUBNzK9V4e9SUqA7CGRCRo=
github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k=
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrkmcRQMAE9LMbQXPo95aqFnf+12B7SyFVI=
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs=
github.com/openshift/library-go v0.0.0-20230622115850-9596e367bcb4 h1:wPpKgf6vbnsCdPcuv3pzHcwjyxm60wHooZ0ZWpZhG3E=
Expand Down
20 changes: 0 additions & 20 deletions lib/capability/capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
},
wantEnabledKeys: []string{},
},
Expand All @@ -69,15 +66,11 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
string(configv1.ClusterVersionCapabilityMachineAPI),
},
},
{name: "set capabilities vCurrent",
Expand All @@ -99,9 +92,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand All @@ -113,9 +103,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
},
},
{name: "set capabilities None with additional",
Expand All @@ -137,9 +124,6 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
},
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
},
Expand All @@ -162,15 +146,11 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
string(configv1.ClusterVersionCapabilityImageRegistry),
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
string(configv1.ClusterVersionCapabilityMarketplace),
string(configv1.ClusterVersionCapabilityOpenShiftSamples),
string(configv1.ClusterVersionCapabilityMachineAPI),
"cap1",
"cap2",
"cap3",
Expand Down
Loading