Skip to content

OCPVE-646: add cloud credential capability #963

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-bot merged 2 commits into from
Dec 5, 2023
Merged

OCPVE-646: add cloud credential capability #963

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
e510854
vendor: bump openshift/api
qJkee Nov 6, 2023
df1f459
update tests with new capabilities
qJkee Sep 5, 2023
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-20231020115248-f404f2bc3524
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7
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 @@ -81,8 +81,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.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524 h1:+hOy0dbg/WIQ2TpBh+aWmoKTHYB82nSM8CfIZtjBmr8=
github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4 h1:5RyeLvTSZEn/fDQA6e6+qIvFPssWjreY8pbwfg4/EEQ=
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1/go.mod h1:ihUJrhBcYAGYQrJu/gP2OMgfVds5f5z5kbeLNBqjHLo=
github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng=
Expand Down
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 @@ -48,6 +48,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
string(configv1.ClusterVersionCapabilityCloudCredential),
},
wantEnabledKeys: []string{},
},
Expand All @@ -74,6 +75,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
string(configv1.ClusterVersionCapabilityCloudCredential),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand Down Expand Up @@ -105,6 +107,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
string(configv1.ClusterVersionCapabilityCloudCredential),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand All @@ -120,6 +123,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
string(configv1.ClusterVersionCapabilityCloudCredential),
},
},
{name: "set capabilities None with additional",
Expand All @@ -145,6 +149,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
string(configv1.ClusterVersionCapabilityCloudCredential),
},
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
},
Expand All @@ -171,6 +176,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityDeploymentConfig),
string(configv1.ClusterVersionCapabilityBuild),
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
string(configv1.ClusterVersionCapabilityCloudCredential),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand Down
236 changes: 118 additions & 118 deletions pkg/cvo/cvo_scenarios_test.go
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions ...b.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions ...com/openshift/api/config/v1/0000_10_config-operator_01_apiserver-CustomNoUpgrade.crd.yaml
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions .../github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver-Default.crd.yaml
View file
Open in desktop

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

Loading