Skip to content

Commit e23ee60

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #963 from qJkee/OCPVE-646
OCPVE-646: add cloud credential capability
2 parents fb57321 + df1f459 commit e23ee60

36 files changed

+4254
-221
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/ghodss/yaml v1.0.0
99
github.com/google/go-cmp v0.5.9
1010
github.com/google/uuid v1.3.0
11-
github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524
11+
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4
1212
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
1313
github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7
1414
github.com/operator-framework/api v0.17.1

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
8181
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
8282
github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
8383
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
84-
github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524 h1:+hOy0dbg/WIQ2TpBh+aWmoKTHYB82nSM8CfIZtjBmr8=
85-
github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
84+
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4 h1:5RyeLvTSZEn/fDQA6e6+qIvFPssWjreY8pbwfg4/EEQ=
85+
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
8686
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
8787
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1/go.mod h1:ihUJrhBcYAGYQrJu/gP2OMgfVds5f5z5kbeLNBqjHLo=
8888
github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng=

‎lib/capability/capability_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func TestSetCapabilities(t *testing.T) {
4848
string(configv1.ClusterVersionCapabilityDeploymentConfig),
4949
string(configv1.ClusterVersionCapabilityBuild),
5050
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
51+
string(configv1.ClusterVersionCapabilityCloudCredential),
5152
},
5253
wantEnabledKeys: []string{},
5354
},
@@ -74,6 +75,7 @@ func TestSetCapabilities(t *testing.T) {
7475
string(configv1.ClusterVersionCapabilityDeploymentConfig),
7576
string(configv1.ClusterVersionCapabilityBuild),
7677
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
78+
string(configv1.ClusterVersionCapabilityCloudCredential),
7779
},
7880
wantEnabledKeys: []string{
7981
string(configv1.ClusterVersionCapabilityBaremetal),
@@ -105,6 +107,7 @@ func TestSetCapabilities(t *testing.T) {
105107
string(configv1.ClusterVersionCapabilityDeploymentConfig),
106108
string(configv1.ClusterVersionCapabilityBuild),
107109
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
110+
string(configv1.ClusterVersionCapabilityCloudCredential),
108111
},
109112
wantEnabledKeys: []string{
110113
string(configv1.ClusterVersionCapabilityBaremetal),
@@ -120,6 +123,7 @@ func TestSetCapabilities(t *testing.T) {
120123
string(configv1.ClusterVersionCapabilityDeploymentConfig),
121124
string(configv1.ClusterVersionCapabilityBuild),
122125
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
126+
string(configv1.ClusterVersionCapabilityCloudCredential),
123127
},
124128
},
125129
{name: "set capabilities None with additional",
@@ -145,6 +149,7 @@ func TestSetCapabilities(t *testing.T) {
145149
string(configv1.ClusterVersionCapabilityDeploymentConfig),
146150
string(configv1.ClusterVersionCapabilityBuild),
147151
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
152+
string(configv1.ClusterVersionCapabilityCloudCredential),
148153
},
149154
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
150155
},
@@ -171,6 +176,7 @@ func TestSetCapabilities(t *testing.T) {
171176
string(configv1.ClusterVersionCapabilityDeploymentConfig),
172177
string(configv1.ClusterVersionCapabilityBuild),
173178
string(configv1.ClusterVersionCapabilityOperatorLifecycleManager),
179+
string(configv1.ClusterVersionCapabilityCloudCredential),
174180
},
175181
wantEnabledKeys: []string{
176182
string(configv1.ClusterVersionCapabilityBaremetal),

‎pkg/cvo/cvo_scenarios_test.go

+118-118
Large diffs are not rendered by default.

‎vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver-CustomNoUpgrade.crd.yaml

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver-Default.crd.yaml

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)