diff --git a/go.mod b/go.mod index 18965a6539..8beade3fde 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/google/go-cmp v0.5.6 github.com/google/uuid v1.2.0 - github.com/openshift/api v0.0.0-20221207195358-a671aa80d995 + github.com/openshift/api v0.0.0-20230106230226-5ad311dde226 github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e github.com/openshift/library-go v0.0.0-20221012165547-f859132ee700 github.com/operator-framework/api v0.17.1 diff --git a/go.sum b/go.sum index 82a56d7ae7..71d93d7311 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,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.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= -github.com/openshift/api v0.0.0-20221207195358-a671aa80d995 h1:pPxxrUWeT7mB/ujSfQ7jkfdjFCgjcnsP/uTRU5FcCpk= -github.com/openshift/api v0.0.0-20221207195358-a671aa80d995/go.mod h1:OW9hi5XDXOQWm/kRqUww6RVxZSf0nqrS4heerSmHBC4= +github.com/openshift/api v0.0.0-20230106230226-5ad311dde226 h1:3rIQjfVsJFmPPKWMewfBQrazCGdVLuNOepDdfSGsPnA= +github.com/openshift/api v0.0.0-20230106230226-5ad311dde226/go.mod h1:OW9hi5XDXOQWm/kRqUww6RVxZSf0nqrS4heerSmHBC4= github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e h1:ab+BJg7h50pi2/rbMkDSXfYx8w80HLmr7NBs8H1hEvU= github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e/go.mod h1:e+TTiBDGWB3O3p3iAzl054x3cZDWhrZ5+jxJRCdEFkA= github.com/openshift/library-go v0.0.0-20221012165547-f859132ee700 h1:oMpH9KrXW4taP3OGgofy7tLOHc6I14B5uplnqJ6vr8c= diff --git a/lib/capability/capability_test.go b/lib/capability/capability_test.go index ef2519b70c..8aa77a381d 100644 --- a/lib/capability/capability_test.go +++ b/lib/capability/capability_test.go @@ -42,6 +42,7 @@ func TestSetCapabilities(t *testing.T) { string(configv1.ClusterVersionCapabilityInsights), string(configv1.ClusterVersionCapabilityStorage), string(configv1.ClusterVersionCapabilityCSISnapshot), + string(configv1.ClusterVersionCapabilityNodeTuning), }, wantEnabledKeys: []string{}, }, @@ -62,6 +63,7 @@ func TestSetCapabilities(t *testing.T) { string(configv1.ClusterVersionCapabilityInsights), string(configv1.ClusterVersionCapabilityStorage), string(configv1.ClusterVersionCapabilityCSISnapshot), + string(configv1.ClusterVersionCapabilityNodeTuning), }, wantEnabledKeys: []string{ string(configv1.ClusterVersionCapabilityBaremetal), @@ -86,6 +88,7 @@ func TestSetCapabilities(t *testing.T) { string(configv1.ClusterVersionCapabilityInsights), string(configv1.ClusterVersionCapabilityStorage), string(configv1.ClusterVersionCapabilityCSISnapshot), + string(configv1.ClusterVersionCapabilityNodeTuning), }, wantEnabledKeys: []string{ string(configv1.ClusterVersionCapabilityBaremetal), @@ -95,6 +98,7 @@ func TestSetCapabilities(t *testing.T) { string(configv1.ClusterVersionCapabilityInsights), string(configv1.ClusterVersionCapabilityStorage), string(configv1.ClusterVersionCapabilityCSISnapshot), + string(configv1.ClusterVersionCapabilityNodeTuning), }, }, {name: "set capabilities None with additional", @@ -114,6 +118,7 @@ func TestSetCapabilities(t *testing.T) { string(configv1.ClusterVersionCapabilityInsights), string(configv1.ClusterVersionCapabilityStorage), string(configv1.ClusterVersionCapabilityCSISnapshot), + string(configv1.ClusterVersionCapabilityNodeTuning), }, wantEnabledKeys: []string{"cap1", "cap2", "cap3"}, }, @@ -134,6 +139,7 @@ func TestSetCapabilities(t *testing.T) { string(configv1.ClusterVersionCapabilityInsights), string(configv1.ClusterVersionCapabilityStorage), string(configv1.ClusterVersionCapabilityCSISnapshot), + string(configv1.ClusterVersionCapabilityNodeTuning), }, wantEnabledKeys: []string{ string(configv1.ClusterVersionCapabilityBaremetal), diff --git a/pkg/cvo/cvo_scenarios_test.go b/pkg/cvo/cvo_scenarios_test.go index 3ba1ac660c..b84608cd4d 100644 --- a/pkg/cvo/cvo_scenarios_test.go +++ b/pkg/cvo/cvo_scenarios_test.go @@ -217,8 +217,8 @@ func TestCVO_StartupAndSync(t *testing.T) { {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"}, @@ -274,8 +274,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, }, @@ -300,8 +300,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, }, @@ -326,8 +326,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, }, @@ -353,8 +353,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, }, @@ -395,8 +395,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -429,8 +429,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -455,8 +455,8 @@ func TestCVO_StartupAndSync(t *testing.T) { LastProgress: time.Unix(1, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -481,8 +481,8 @@ func TestCVO_StartupAndSync(t *testing.T) { LastProgress: time.Unix(2, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -508,8 +508,8 @@ func TestCVO_StartupAndSync(t *testing.T) { LastProgress: time.Unix(3, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -634,8 +634,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime, AcceptedRisks: "The update cannot be verified: some random error"}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"}, @@ -690,8 +690,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -718,8 +718,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -746,8 +746,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -801,8 +801,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime, AcceptedRisks: "The update cannot be verified: some random error"}, @@ -835,8 +835,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -863,8 +863,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { LastProgress: time.Unix(1, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -891,8 +891,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { LastProgress: time.Unix(2, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -920,8 +920,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1038,8 +1038,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"}, @@ -1100,8 +1100,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, }, @@ -1127,8 +1127,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, }, @@ -1147,8 +1147,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1200,8 +1200,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -1234,8 +1234,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1261,8 +1261,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1288,8 +1288,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1316,8 +1316,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1532,8 +1532,8 @@ func TestCVO_UpgradeUnverifiedPayload(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1579,8 +1579,8 @@ func TestCVO_UpgradeUnverifiedPayload(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.1-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime, AcceptedRisks: "The update cannot be verified: some random error"}, @@ -1793,8 +1793,8 @@ func TestCVO_ResetPayloadLoadStatus(t *testing.T) { LastProgress: time.Unix(1, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -1827,8 +1827,8 @@ func TestCVO_ResetPayloadLoadStatus(t *testing.T) { Desired: desired, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:0", Version: "1.0.0-abc", Verified: true, StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -1965,7 +1965,7 @@ func TestCVO_UpgradeFailedPayloadLoadWithCapsChanges(t *testing.T) { // confirm capabilities are updated checkStatus(t, actions[1], "update", "clusterversions", "status", "", configv1.ClusterVersionCapabilitiesStatus{ EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }) } @@ -2003,7 +2003,7 @@ func TestCVO_InitImplicitlyEnabledCaps(t *testing.T) { }, // Emulates capabilities status set by a previous pod Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, @@ -2068,10 +2068,10 @@ func TestCVO_InitImplicitlyEnabledCaps(t *testing.T) { VersionHash: "DL-FFQ2Uem8=", Architecture: architecture, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, - ImplicitlyEnabledCaps: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + ImplicitlyEnabledCaps: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2111,11 +2111,11 @@ func TestCVO_InitImplicitlyEnabledCaps(t *testing.T) { {State: configv1.CompletedUpdate, Image: "image/image:0", Version: "1.0.0-abc", Verified: true, StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ - {Type: ImplicitlyEnabledCapabilities, Status: configv1.ConditionTrue, Reason: "CapabilitiesImplicitlyEnabled", Message: "The following capabilities could not be disabled: CSISnapshot, Console, Insights, Storage, marketplace, openshift-samples"}, + {Type: ImplicitlyEnabledCapabilities, Status: configv1.ConditionTrue, Reason: "CapabilitiesImplicitlyEnabled", Message: "The following capabilities could not be disabled: CSISnapshot, Console, Insights, NodeTuning, Storage, marketplace, openshift-samples"}, {Type: DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded", Message: "Payload loaded version=\"1.0.1-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""}, {Type: "Available", Status: "False"}, @@ -2323,8 +2323,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -2371,8 +2371,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.1-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime, AcceptedRisks: "The update cannot be verified: some random error"}, @@ -2408,8 +2408,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -2583,8 +2583,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -2607,8 +2607,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -2631,8 +2631,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -2678,8 +2678,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.1-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -2817,8 +2817,8 @@ func TestCVO_UpgradePreconditionFailingAcceptedRisks(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -2936,8 +2936,8 @@ func TestCVO_UpgradeVerifiedPayload(t *testing.T) { {State: configv1.CompletedUpdate, Image: "image/image:0", Version: "1.0.0-abc", Verified: true, StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"}, @@ -3068,8 +3068,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { LastProgress: time.Unix(2, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3093,8 +3093,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { LastProgress: time.Unix(3, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3118,8 +3118,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { LastProgress: time.Unix(4, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3161,8 +3161,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { LastProgress: time.Unix(1, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3185,8 +3185,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { LastProgress: time.Unix(2, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3210,8 +3210,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { LastProgress: time.Unix(3, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3235,8 +3235,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { LastProgress: time.Unix(4, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3394,8 +3394,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { }, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3430,8 +3430,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { LastProgress: time.Unix(1, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3481,8 +3481,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { LastProgress: time.Unix(1, 0), CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3522,8 +3522,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", Verified: true, StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -3650,8 +3650,8 @@ func TestCVO_ParallelError(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3686,8 +3686,8 @@ func TestCVO_ParallelError(t *testing.T) { Generation: 1, CapabilitiesStatus: CapabilityStatus{ Status: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, }, loadPayloadStatus: LoadPayloadStatus{ @@ -3730,8 +3730,8 @@ func TestCVO_ParallelError(t *testing.T) { Desired: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, VersionHash: "Gyh2W6qcDO4=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, - KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + EnabledCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, + KnownCapabilities: []configv1.ClusterVersionCapability{configv1.ClusterVersionCapabilityCSISnapshot, configv1.ClusterVersionCapabilityConsole, configv1.ClusterVersionCapabilityInsights, configv1.ClusterVersionCapabilityNodeTuning, configv1.ClusterVersionCapabilityStorage, configv1.ClusterVersionCapabilityBaremetal, configv1.ClusterVersionCapabilityMarketplace, configv1.ClusterVersionCapabilityOpenShiftSamples}, }, History: []configv1.UpdateHistory{ {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime}, diff --git a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml index de04ec4d9e..16a333ca8b 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml @@ -70,6 +70,7 @@ spec: - Insights - Storage - CSISnapshot + - NodeTuning x-kubernetes-list-type: atomic baselineCapabilitySet: description: baselineCapabilitySet selects an initial set of optional capabilities to enable, which can be extended via additionalEnabledCapabilities. If unset, the cluster will choose a default, and the default may change over time. The current default is vCurrent. @@ -78,6 +79,7 @@ spec: - None - v4.11 - v4.12 + - v4.13 - vCurrent channel: description: channel is an identifier for explicitly requesting that a non-default set of updates be applied to this cluster. The default channel will be contain stable updates that are appropriate for production clusters. @@ -189,6 +191,7 @@ spec: - Insights - Storage - CSISnapshot + - NodeTuning x-kubernetes-list-type: atomic knownCapabilities: description: knownCapabilities lists all the capabilities known to the current cluster. @@ -204,6 +207,7 @@ spec: - Insights - Storage - CSISnapshot + - NodeTuning x-kubernetes-list-type: atomic conditionalUpdates: description: conditionalUpdates contains the list of updates that may be recommended for this cluster if it meets specific required conditions. Consumers interested in the set of updates that are actually recommended for this cluster should use availableUpdates. This list may be empty if no updates are recommended, if the update service is unavailable, or if an empty or invalid channel has been specified. diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml index 28773b7df6..fe57bddfc6 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml @@ -81,6 +81,28 @@ spec: equinixMetal: description: EquinixMetal contains settings specific to the Equinix Metal infrastructure provider. type: object + external: + description: ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately. + type: object + properties: + cloudControllerManager: + description: CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI) + type: object + properties: + state: + description: "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager \n When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected." + type: string + enum: + - "" + - External + - None + platformName: + description: PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making. + type: string + default: Unknown + x-kubernetes-validations: + - rule: oldSelf == 'Unknown' || self == oldSelf + message: platform name cannot be changed once set gcp: description: GCP contains settings specific to the Google Cloud Platform infrastructure provider. type: object @@ -200,6 +222,7 @@ spec: - PowerVS - AlibabaCloud - Nutanix + - External vsphere: description: VSphere contains settings specific to the VSphere infrastructure provider. type: object @@ -254,6 +277,7 @@ spec: - PowerVS - AlibabaCloud - Nutanix + - External platformStatus: description: platformStatus holds status information specific to the underlying infrastructure provider. type: object @@ -401,6 +425,9 @@ spec: ingressIP: description: ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names. type: string + external: + description: External contains settings specific to the generic External infrastructure provider. + type: object gcp: description: GCP contains settings specific to the Google Cloud Platform infrastructure provider. type: object @@ -576,6 +603,7 @@ spec: - PowerVS - AlibabaCloud - Nutanix + - External vsphere: description: VSphere contains settings specific to the VSphere infrastructure provider. type: object diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml index b1dc45140a..01eeb09289 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml @@ -76,6 +76,28 @@ spec: equinixMetal: description: EquinixMetal contains settings specific to the Equinix Metal infrastructure provider. type: object + external: + description: ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately. + properties: + cloudControllerManager: + description: CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI) + properties: + state: + description: "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager \n When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected." + enum: + - "" + - External + - None + type: string + type: object + platformName: + default: Unknown + description: PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making. + type: string + x-kubernetes-validations: + - message: platform name cannot be changed once set + rule: oldSelf == 'Unknown' || self == oldSelf + type: object gcp: description: GCP contains settings specific to the Google Cloud Platform infrastructure provider. type: object @@ -194,6 +216,7 @@ spec: - PowerVS - AlibabaCloud - Nutanix + - External type: string vsphere: description: VSphere contains settings specific to the VSphere infrastructure provider. @@ -401,6 +424,7 @@ spec: - PowerVS - AlibabaCloud - Nutanix + - External type: string platformStatus: description: platformStatus holds status information specific to the underlying infrastructure provider. @@ -548,6 +572,9 @@ spec: description: ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names. type: string type: object + external: + description: External contains settings specific to the generic External infrastructure provider. + type: object gcp: description: GCP contains settings specific to the Google Cloud Platform infrastructure provider. properties: @@ -722,6 +749,7 @@ spec: - PowerVS - AlibabaCloud - Nutanix + - External type: string vsphere: description: VSphere contains settings specific to the VSphere infrastructure provider. diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml index 427f0b1c13..0d7dec19e5 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml @@ -121,6 +121,7 @@ spec: - PowerVS - AlibabaCloud - Nutanix + - External requiredHSTSPolicies: description: "requiredHSTSPolicies specifies HSTS policies that are required to be set on newly created or updated routes matching the domainPattern/s and namespaceSelector/s that are specified in the policy. Each requiredHSTSPolicy must have at least a domainPattern and a maxAge to validate a route HSTS Policy route annotation, and affect route admission. \n A candidate route is checked for HSTS Policies if it has the HSTS Policy route annotation: \"haproxy.router.openshift.io/hsts_header\" E.g. haproxy.router.openshift.io/hsts_header: max-age=31536000;preload;includeSubDomains \n - For each candidate route, if it matches a requiredHSTSPolicy domainPattern and optional namespaceSelector, then the maxAge, preloadPolicy, and includeSubdomainsPolicy must be valid to be admitted. Otherwise, the route is rejected. - The first match, by domainPattern and optional namespaceSelector, in the ordering of the RequiredHSTSPolicies determines the route's admission status. - If the candidate route doesn't match any requiredHSTSPolicy domainPattern and optional namespaceSelector, then it may use any HSTS Policy annotation. \n The HSTS policy configuration may be changed after routes have already been created. An update to a previously admitted route may then fail if the updated route does not conform to the updated HSTS policy configuration. However, changing the HSTS policy configuration will not cause a route that is already admitted to stop working. \n Note that if there are no RequiredHSTSPolicies, any HSTS Policy annotation on the route is valid." type: array diff --git a/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml b/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml index e609e56ab0..bbafe4c478 100644 --- a/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml +++ b/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml @@ -12,3 +12,47 @@ tests: apiVersion: config.openshift.io/v1 kind: Infrastructure spec: {} + onUpdate: + - name: Should be able to change External platformName from unknown to something else + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + type: External + external: + platformName: Unknown + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + type: External + external: + platformName: M&PCloud + expected: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + type: External + external: + platformName: M&PCloud + - name: Should not be able to change External platformName once it was set + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + type: External + external: + platformName: M&PCloud + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + type: External + external: + platformName: SomeOtherCoolplatformName + expectedError: " spec.platformSpec.external.platformName: Invalid value: \"string\": platform name cannot be changed once set" diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go index 195313eee1..1a7697ad15 100644 --- a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go +++ b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go @@ -244,7 +244,7 @@ const ( ) // ClusterVersionCapability enumerates optional, core cluster components. -// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot +// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning type ClusterVersionCapability string const ( @@ -287,6 +287,12 @@ const ( // VolumeSnapshot CRD objects and manages the creation and deletion // lifecycle of volume snapshots ClusterVersionCapabilityCSISnapshot ClusterVersionCapability = "CSISnapshot" + + // ClusterVersionCapabilityNodeTuning manages the Node Tuning Operator + // which is responsible for watching the Tuned and Profile CRD + // objects and manages the containerized TuneD daemon which controls + // system level tuning of Nodes + ClusterVersionCapabilityNodeTuning ClusterVersionCapability = "NodeTuning" ) // KnownClusterVersionCapabilities includes all known optional, core cluster components. @@ -298,10 +304,11 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{ ClusterVersionCapabilityStorage, ClusterVersionCapabilityOpenShiftSamples, ClusterVersionCapabilityCSISnapshot, + ClusterVersionCapabilityNodeTuning, } // ClusterVersionCapabilitySet defines sets of cluster version capabilities. -// +kubebuilder:validation:Enum=None;v4.11;v4.12;vCurrent +// +kubebuilder:validation:Enum=None;v4.11;v4.12;v4.13;vCurrent type ClusterVersionCapabilitySet string const ( @@ -321,6 +328,12 @@ const ( // version of OpenShift is installed. ClusterVersionCapabilitySet4_12 ClusterVersionCapabilitySet = "v4.12" + // ClusterVersionCapabilitySet4_13 is the recommended set of + // optional capabilities to enable for the 4.13 version of + // OpenShift. This list will remain the same no matter which + // version of OpenShift is installed. + ClusterVersionCapabilitySet4_13 ClusterVersionCapabilitySet = "v4.13" + // ClusterVersionCapabilitySetCurrent is the recommended set // of optional capabilities to enable for the cluster's // current version of OpenShift. @@ -344,6 +357,16 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilityOpenShiftSamples, ClusterVersionCapabilityCSISnapshot, }, + ClusterVersionCapabilitySet4_13: { + ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityConsole, + ClusterVersionCapabilityInsights, + ClusterVersionCapabilityMarketplace, + ClusterVersionCapabilityStorage, + ClusterVersionCapabilityOpenShiftSamples, + ClusterVersionCapabilityCSISnapshot, + ClusterVersionCapabilityNodeTuning, + }, ClusterVersionCapabilitySetCurrent: { ClusterVersionCapabilityBaremetal, ClusterVersionCapabilityConsole, @@ -352,6 +375,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilityStorage, ClusterVersionCapabilityOpenShiftSamples, ClusterVersionCapabilityCSISnapshot, + ClusterVersionCapabilityNodeTuning, }, } diff --git a/vendor/github.com/openshift/api/config/v1/types_feature.go b/vendor/github.com/openshift/api/config/v1/types_feature.go index 949ca5d480..757517d2cc 100644 --- a/vendor/github.com/openshift/api/config/v1/types_feature.go +++ b/vendor/github.com/openshift/api/config/v1/types_feature.go @@ -109,8 +109,6 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{ Disabled: []string{}, }, TechPreviewNoUpgrade: newDefaultFeatures(). - with("CSIMigrationAzureFile"). // sig-storage, fbertina, Kubernetes feature gate - with("CSIMigrationvSphere"). // sig-storage, fbertina, Kubernetes feature gate with("ExternalCloudProvider"). // sig-cloud-provider, jspeed, OCP specific with("CSIDriverSharedResource"). // sig-build, adkaplan, OCP specific with("BuildCSIVolumes"). // sig-build, adkaplan, OCP specific @@ -121,7 +119,6 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{ with("InsightsConfigAPI"). // insights, tremes (#ccx), OCP specific with("CSIInlineVolumeAdmission"). // sig-storage, jdobson, OCP specific with("MatchLabelKeysInPodTopologySpread"). // sig-scheduling, ingvagabund (#forum-workloads), Kubernetes feature gate - with("OpenShiftPodSecurityAdmission"). // bz-auth, standa, OCP specific toFeatures(), LatencySensitive: newDefaultFeatures(). with( @@ -135,11 +132,9 @@ var defaultFeatures = &FeatureGateEnabledDisabled{ "APIPriorityAndFairness", // sig-apimachinery, deads2k "RotateKubeletServerCertificate", // sig-pod, sjenning "DownwardAPIHugePages", // sig-node, rphillips + "OpenShiftPodSecurityAdmission", // bz-auth, stlaz, OCP specific }, - Disabled: []string{ - "CSIMigrationAzureFile", // sig-storage, jsafrane - "CSIMigrationvSphere", // sig-storage, jsafrane - }, + Disabled: []string{}, } type featureSetBuilder struct { diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go index 149e46ac3a..f1f1697a70 100644 --- a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go +++ b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go @@ -124,7 +124,7 @@ const ( ) // PlatformType is a specific supported infrastructure provider. -// +kubebuilder:validation:Enum="";AWS;Azure;BareMetal;GCP;Libvirt;OpenStack;None;VSphere;oVirt;IBMCloud;KubeVirt;EquinixMetal;PowerVS;AlibabaCloud;Nutanix +// +kubebuilder:validation:Enum="";AWS;Azure;BareMetal;GCP;Libvirt;OpenStack;None;VSphere;oVirt;IBMCloud;KubeVirt;EquinixMetal;PowerVS;AlibabaCloud;Nutanix;External type PlatformType string const ( @@ -172,6 +172,9 @@ const ( // NutanixPlatformType represents Nutanix infrastructure. NutanixPlatformType PlatformType = "Nutanix" + + // ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately. + ExternalPlatformType PlatformType = "External" ) // IBMCloudProviderType is a specific supported IBM Cloud provider cluster type @@ -189,6 +192,50 @@ const ( IBMCloudProviderTypeUPI IBMCloudProviderType = "UPI" ) +// CloudControllerManagerState defines whether Cloud Controller Manager presence is expected or not +type CloudControllerManagerState string + +const ( + // Cloud Controller Manager is enabled and expected to be installed. + // This value indicates that new nodes should be tainted as uninitialized when created, + // preventing them from running workloads until they are initialized by the cloud controller manager. + CloudControllerManagerExternal CloudControllerManagerState = "External" + + // Cloud Controller Manager is disabled and not expected to be installed. + // This value indicates that new nodes should not be tainted + // and no extra node initialization is expected from the cloud controller manager. + CloudControllerManagerNone CloudControllerManagerState = "None" +) + +// CloudControllerManagerSpec holds Cloud Controller Manager (a.k.a. CCM or CPI) related settings +type CloudControllerManagerSpec struct { + // state determines whether or not an external Cloud Controller Manager is expected to + // be installed within the cluster. + // https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager + // + // When set to "External", new nodes will be tainted as uninitialized when created, + // preventing them from running workloads until they are initialized by the cloud controller manager. + // When omitted or set to "None", new nodes will be not tainted + // and no extra initialization from the cloud controller manager is expected. + // +kubebuilder:validation:Enum="";External;None + // +optional + State CloudControllerManagerState `json:"state"` +} + +// ExternalPlatformSpec holds the desired state for the generic External infrastructure provider. +type ExternalPlatformSpec struct { + // PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. + // This field is solely for informational and reporting purposes and is not expected to be used for decision-making. + // +kubebuilder:default:="Unknown" + // +default="Unknown" + // +kubebuilder:validation:XValidation:rule="oldSelf == 'Unknown' || self == oldSelf",message="platform name cannot be changed once set" + // +optional + PlatformName string `json:"platformName,omitempty"` + // CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI) + // +optional + CloudControllerManager CloudControllerManagerSpec `json:"cloudControllerManager"` +} + // PlatformSpec holds the desired state specific to the underlying infrastructure provider // of the current cluster. Since these are used at spec-level for the underlying cluster, it // is supposed that only one of the spec structs is set. @@ -256,8 +303,16 @@ type PlatformSpec struct { // Nutanix contains settings specific to the Nutanix infrastructure provider. // +optional Nutanix *NutanixPlatformSpec `json:"nutanix,omitempty"` + + // ExternalPlatformType represents generic infrastructure provider. + // Platform-specific components should be supplemented separately. + // +optional + External *ExternalPlatformSpec `json:"external,omitempty"` } +// ExternalPlatformStatus holds the current status of the generic External infrastructure provider. +type ExternalPlatformStatus struct{} + // PlatformStatus holds the current status specific to the underlying infrastructure provider // of the current cluster. Since these are used at status-level for the underlying cluster, it // is supposed that only one of the status structs is set. @@ -326,6 +381,10 @@ type PlatformStatus struct { // Nutanix contains settings specific to the Nutanix infrastructure provider. // +optional Nutanix *NutanixPlatformStatus `json:"nutanix,omitempty"` + + // External contains settings specific to the generic External infrastructure provider. + // +optional + External *ExternalPlatformStatus `json:"external,omitempty"` } // AWSServiceEndpoint store the configuration of a custom url to diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go index 59e92ad7a1..a9babbc7f2 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go @@ -817,6 +817,22 @@ func (in *ClientConnectionOverrides) DeepCopy() *ClientConnectionOverrides { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CloudControllerManagerSpec) DeepCopyInto(out *CloudControllerManagerSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CloudControllerManagerSpec. +func (in *CloudControllerManagerSpec) DeepCopy() *CloudControllerManagerSpec { + if in == nil { + return nil + } + out := new(CloudControllerManagerSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterCondition) DeepCopyInto(out *ClusterCondition) { *out = *in @@ -1775,6 +1791,39 @@ func (in *ExternalIPPolicy) DeepCopy() *ExternalIPPolicy { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ExternalPlatformSpec) DeepCopyInto(out *ExternalPlatformSpec) { + *out = *in + out.CloudControllerManager = in.CloudControllerManager + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalPlatformSpec. +func (in *ExternalPlatformSpec) DeepCopy() *ExternalPlatformSpec { + if in == nil { + return nil + } + out := new(ExternalPlatformSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ExternalPlatformStatus) DeepCopyInto(out *ExternalPlatformStatus) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalPlatformStatus. +func (in *ExternalPlatformStatus) DeepCopy() *ExternalPlatformStatus { + if in == nil { + return nil + } + out := new(ExternalPlatformStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FeatureGate) DeepCopyInto(out *FeatureGate) { *out = *in @@ -4036,6 +4085,11 @@ func (in *PlatformSpec) DeepCopyInto(out *PlatformSpec) { *out = new(NutanixPlatformSpec) (*in).DeepCopyInto(*out) } + if in.External != nil { + in, out := &in.External, &out.External + *out = new(ExternalPlatformSpec) + **out = **in + } return } @@ -4117,6 +4171,11 @@ func (in *PlatformStatus) DeepCopyInto(out *PlatformStatus) { *out = new(NutanixPlatformStatus) (*in).DeepCopyInto(*out) } + if in.External != nil { + in, out := &in.External, &out.External + *out = new(ExternalPlatformStatus) + **out = **in + } return } diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go index 5bf6f578ce..0f149c9900 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go @@ -1091,6 +1091,15 @@ func (BareMetalPlatformStatus) SwaggerDoc() map[string]string { return map_BareMetalPlatformStatus } +var map_CloudControllerManagerSpec = map[string]string{ + "": "CloudControllerManagerSpec holds Cloud Controller Manager (a.k.a. CCM or CPI) related settings", + "state": "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager\n\nWhen set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.", +} + +func (CloudControllerManagerSpec) SwaggerDoc() map[string]string { + return map_CloudControllerManagerSpec +} + var map_EquinixMetalPlatformSpec = map[string]string{ "": "EquinixMetalPlatformSpec holds the desired state of the Equinix Metal infrastructure provider. This only includes fields that can be modified in the cluster.", } @@ -1109,6 +1118,24 @@ func (EquinixMetalPlatformStatus) SwaggerDoc() map[string]string { return map_EquinixMetalPlatformStatus } +var map_ExternalPlatformSpec = map[string]string{ + "": "ExternalPlatformSpec holds the desired state for the generic External infrastructure provider.", + "platformName": "PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making.", + "cloudControllerManager": "CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI)", +} + +func (ExternalPlatformSpec) SwaggerDoc() map[string]string { + return map_ExternalPlatformSpec +} + +var map_ExternalPlatformStatus = map[string]string{ + "": "ExternalPlatformStatus holds the current status of the generic External infrastructure provider.", +} + +func (ExternalPlatformStatus) SwaggerDoc() map[string]string { + return map_ExternalPlatformStatus +} + var map_GCPPlatformSpec = map[string]string{ "": "GCPPlatformSpec holds the desired state of the Google Cloud Platform infrastructure provider. This only includes fields that can be modified in the cluster.", } @@ -1311,6 +1338,7 @@ var map_PlatformSpec = map[string]string{ "powervs": "PowerVS contains settings specific to the IBM Power Systems Virtual Servers infrastructure provider.", "alibabaCloud": "AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider.", "nutanix": "Nutanix contains settings specific to the Nutanix infrastructure provider.", + "external": "ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately.", } func (PlatformSpec) SwaggerDoc() map[string]string { @@ -1333,6 +1361,7 @@ var map_PlatformStatus = map[string]string{ "powervs": "PowerVS contains settings specific to the Power Systems Virtual Servers infrastructure provider.", "alibabaCloud": "AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider.", "nutanix": "Nutanix contains settings specific to the Nutanix infrastructure provider.", + "external": "External contains settings specific to the generic External infrastructure provider.", } func (PlatformStatus) SwaggerDoc() map[string]string { diff --git a/vendor/github.com/openshift/api/image/v1/generated.pb.go b/vendor/github.com/openshift/api/image/v1/generated.pb.go index 6344617bb0..ac776ad64d 100644 --- a/vendor/github.com/openshift/api/image/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/image/v1/generated.pb.go @@ -1145,175 +1145,176 @@ func init() { } var fileDescriptor_650a0b34f65fde60 = []byte{ - // 2685 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x6c, 0x1c, 0x49, - 0x15, 0x4e, 0xcf, 0x9f, 0xc7, 0xcf, 0x8e, 0x1d, 0x57, 0xe2, 0xdd, 0xd9, 0x49, 0xd6, 0x76, 0x3a, - 0x24, 0xca, 0x42, 0x76, 0x66, 0x6d, 0xb2, 0x8b, 0x13, 0x24, 0xb2, 0x99, 0x4c, 0x88, 0x06, 0x3c, - 0x1b, 0x6f, 0x79, 0x88, 0x20, 0x0a, 0x12, 0xe5, 0x9e, 0x72, 0xbb, 0xf1, 0x4c, 0xf7, 0xd0, 0xdd, - 0xe3, 0x5d, 0x47, 0x20, 0x21, 0x84, 0x56, 0x7b, 0xe0, 0x00, 0x27, 0x0e, 0x7b, 0x44, 0x2b, 0x84, - 0x90, 0xb8, 0x20, 0x56, 0x9c, 0xb8, 0x00, 0x52, 0xc4, 0x69, 0xb5, 0xe2, 0xb0, 0x17, 0xac, 0x8d, - 0xe1, 0xcc, 0x8d, 0x4b, 0x4e, 0xa8, 0xaa, 0xab, 0xbb, 0xab, 0x7b, 0x7a, 0xec, 0x1e, 0x13, 0x0f, - 0x70, 0x9b, 0xa9, 0xf7, 0xde, 0xf7, 0xaa, 0xde, 0x7b, 0xf5, 0xde, 0xab, 0xaa, 0x86, 0x65, 0xdd, - 0x70, 0xb7, 0xfb, 0x9b, 0x15, 0xcd, 0xea, 0x56, 0xad, 0x1e, 0x35, 0x9d, 0x6d, 0x63, 0xcb, 0xad, - 0x92, 0x9e, 0x51, 0x35, 0xba, 0x44, 0xa7, 0xd5, 0xdd, 0xe5, 0xaa, 0x4e, 0x4d, 0x6a, 0x13, 0x97, - 0xb6, 0x2b, 0x3d, 0xdb, 0x72, 0x2d, 0x74, 0x31, 0x14, 0xa9, 0x04, 0x22, 0x15, 0xd2, 0x33, 0x2a, - 0x5c, 0xa4, 0xb2, 0xbb, 0x5c, 0x7e, 0x55, 0x42, 0xd5, 0x2d, 0xdd, 0xaa, 0x72, 0xc9, 0xcd, 0xfe, - 0x16, 0xff, 0xc7, 0xff, 0xf0, 0x5f, 0x1e, 0x62, 0x59, 0xdd, 0x59, 0x75, 0x2a, 0x86, 0xc5, 0xd5, - 0x6a, 0x96, 0x9d, 0xa4, 0xb5, 0x7c, 0x3d, 0xe4, 0xe9, 0x12, 0x6d, 0xdb, 0x30, 0xa9, 0xbd, 0x57, - 0xed, 0xed, 0xe8, 0x6c, 0xc0, 0xa9, 0x76, 0xa9, 0x4b, 0x92, 0xa4, 0xaa, 0xc3, 0xa4, 0xec, 0xbe, - 0xe9, 0x1a, 0x5d, 0x3a, 0x20, 0xf0, 0xc6, 0x51, 0x02, 0x8e, 0xb6, 0x4d, 0xbb, 0x24, 0x2e, 0xa7, - 0x7e, 0xa2, 0xc0, 0xb9, 0xba, 0xa5, 0xed, 0x50, 0xbb, 0xc1, 0x8c, 0x80, 0xe9, 0x16, 0xb5, 0xa9, - 0xa9, 0x51, 0x74, 0x0d, 0x8a, 0x36, 0xd5, 0x0d, 0xc7, 0xb5, 0xf7, 0x4a, 0xca, 0x92, 0x72, 0x75, - 0xb2, 0x76, 0xe6, 0xc9, 0xfe, 0xe2, 0xa9, 0x83, 0xfd, 0xc5, 0x22, 0x16, 0xe3, 0x38, 0xe0, 0x40, - 0x55, 0x98, 0x34, 0x49, 0x97, 0x3a, 0x3d, 0xa2, 0xd1, 0x52, 0x86, 0xb3, 0xcf, 0x09, 0xf6, 0xc9, - 0xb7, 0x7c, 0x02, 0x0e, 0x79, 0xd0, 0x12, 0xe4, 0xd8, 0x9f, 0x52, 0x96, 0xf3, 0x4e, 0x0b, 0xde, - 0x1c, 0xe3, 0xc5, 0x9c, 0x82, 0x5e, 0x86, 0xac, 0x4b, 0xf4, 0x52, 0x8e, 0x33, 0x4c, 0x09, 0x86, - 0x6c, 0x8b, 0xe8, 0x98, 0x8d, 0xa3, 0x32, 0x64, 0x8c, 0x7a, 0x29, 0xcf, 0xa9, 0x20, 0xa8, 0x99, - 0x46, 0x1d, 0x67, 0x8c, 0xba, 0xfa, 0xd7, 0x22, 0xe4, 0xf9, 0x72, 0xd0, 0x77, 0xa0, 0xc8, 0x4c, - 0xdc, 0x26, 0x2e, 0xe1, 0xab, 0x98, 0x5a, 0x79, 0xad, 0xe2, 0x59, 0xaa, 0x22, 0x5b, 0xaa, 0xd2, - 0xdb, 0xd1, 0xd9, 0x80, 0x53, 0x61, 0xdc, 0x95, 0xdd, 0xe5, 0xca, 0xfd, 0xcd, 0xef, 0x52, 0xcd, - 0x6d, 0x52, 0x97, 0xd4, 0x90, 0x40, 0x87, 0x70, 0x0c, 0x07, 0xa8, 0x68, 0x1d, 0xce, 0xb5, 0x13, - 0xec, 0x27, 0x8c, 0x70, 0x41, 0xc8, 0x26, 0xda, 0x18, 0x27, 0x4a, 0xa2, 0xef, 0xc3, 0x59, 0x69, - 0xbc, 0xe9, 0x4f, 0x3f, 0xcb, 0xa7, 0xff, 0xea, 0xd0, 0xe9, 0x0b, 0x47, 0x57, 0x30, 0x79, 0xe7, - 0xee, 0xbb, 0x2e, 0x35, 0x1d, 0xc3, 0x32, 0x6b, 0xe7, 0x85, 0xfe, 0xb3, 0xf5, 0x41, 0x44, 0x9c, - 0xa4, 0x06, 0x6d, 0x42, 0x39, 0x61, 0xf8, 0x01, 0xb5, 0x19, 0x9e, 0xf0, 0x86, 0x2a, 0x50, 0xcb, - 0xf5, 0xa1, 0x9c, 0xf8, 0x10, 0x14, 0xd4, 0x8c, 0xae, 0x90, 0x98, 0xc6, 0x16, 0x75, 0x5c, 0xe1, - 0xcc, 0xc4, 0x29, 0x0b, 0x16, 0x9c, 0x24, 0x87, 0x76, 0x61, 0x4e, 0x1a, 0x5e, 0x23, 0x7b, 0xd4, - 0x76, 0x4a, 0x85, 0xa5, 0x2c, 0x37, 0xd7, 0x91, 0x9b, 0xbe, 0x12, 0x4a, 0xd5, 0x5e, 0x12, 0xba, - 0xe7, 0xea, 0x71, 0x3c, 0x3c, 0xa8, 0x02, 0x51, 0x00, 0xc7, 0xd0, 0x4d, 0xe2, 0xf6, 0x6d, 0xea, - 0x94, 0x26, 0xb8, 0xc2, 0xe5, 0xb4, 0x0a, 0x37, 0x7c, 0xc9, 0x30, 0xbe, 0x82, 0x21, 0x07, 0x4b, - 0xc0, 0xe8, 0x3e, 0xcc, 0x4b, 0xba, 0x43, 0xa6, 0x52, 0x71, 0x29, 0x7b, 0x75, 0xba, 0xf6, 0xd2, - 0xc1, 0xfe, 0xe2, 0x7c, 0x3d, 0x89, 0x01, 0x27, 0xcb, 0xa1, 0x6d, 0xb8, 0x90, 0x60, 0xc6, 0x26, - 0x6d, 0x1b, 0xa4, 0xb5, 0xd7, 0xa3, 0xa5, 0x49, 0xee, 0x87, 0xcf, 0x89, 0x69, 0x5d, 0xa8, 0x1f, - 0xc2, 0x8b, 0x0f, 0x45, 0x42, 0xf7, 0x22, 0x9e, 0xb9, 0x63, 0x99, 0x5b, 0x86, 0x5e, 0x02, 0x0e, - 0x9f, 0x64, 0x6a, 0x8f, 0x01, 0x0f, 0xca, 0xa0, 0x1f, 0x29, 0x91, 0x6d, 0xe6, 0x6b, 0x72, 0x4a, - 0x53, 0xdc, 0xea, 0xaf, 0xa5, 0xb5, 0xba, 0x2f, 0x98, 0xb8, 0x31, 0x03, 0x54, 0x9c, 0xa8, 0x4b, - 0xfd, 0xb9, 0x02, 0x67, 0xf9, 0x50, 0xad, 0x63, 0x6d, 0x06, 0xfb, 0xd5, 0x41, 0xab, 0x30, 0xcd, - 0xb5, 0x34, 0x0d, 0xc7, 0x31, 0x4c, 0x9d, 0xef, 0xd4, 0x62, 0xed, 0x9c, 0xd0, 0x30, 0xdd, 0x90, - 0x68, 0x38, 0xc2, 0x89, 0x54, 0x28, 0x74, 0xbc, 0x70, 0x55, 0x96, 0xb2, 0x2c, 0x91, 0x1d, 0xec, - 0x2f, 0x16, 0x44, 0xc0, 0x09, 0x0a, 0xe3, 0xd1, 0x3c, 0xc3, 0x79, 0x29, 0x85, 0xf3, 0x08, 0x4b, - 0x09, 0x8a, 0xfa, 0xe7, 0x2c, 0xcc, 0x72, 0x35, 0x8d, 0x6e, 0xcf, 0xb2, 0xdd, 0x8d, 0x1e, 0xd5, - 0xd0, 0x5d, 0xc8, 0x6d, 0xd9, 0x56, 0x57, 0xa4, 0xbd, 0x4b, 0x52, 0xde, 0xa8, 0xb0, 0x5a, 0x15, - 0x26, 0xb9, 0x60, 0x25, 0x61, 0x1a, 0xfe, 0xaa, 0x6d, 0x75, 0x31, 0x17, 0x47, 0x6f, 0x42, 0xc6, - 0xb5, 0xb8, 0xea, 0xa9, 0x95, 0xab, 0x49, 0x20, 0x6b, 0x96, 0x46, 0x3a, 0x71, 0xa4, 0x02, 0xcb, - 0xc6, 0x2d, 0x0b, 0x67, 0x5c, 0x0b, 0x75, 0x98, 0x79, 0xd8, 0xb4, 0xd6, 0xad, 0x8e, 0xa1, 0xed, - 0x89, 0x44, 0xb6, 0x92, 0xc2, 0x65, 0x2d, 0xa2, 0x37, 0x24, 0x49, 0xd9, 0xa4, 0xe1, 0x28, 0x8e, - 0xa0, 0xa3, 0x77, 0x61, 0xd6, 0xf6, 0xa7, 0x21, 0x14, 0xe6, 0xb9, 0xc2, 0xd7, 0xd3, 0x29, 0xc4, - 0x51, 0xe1, 0xda, 0x8b, 0x42, 0xe7, 0x6c, 0x8c, 0x80, 0xe3, 0x6a, 0xd0, 0x6d, 0x98, 0x35, 0x4c, - 0xad, 0xd3, 0x6f, 0x87, 0x19, 0x2d, 0xc7, 0x23, 0x21, 0x80, 0x68, 0x44, 0xc9, 0x38, 0xce, 0xaf, - 0xfe, 0x26, 0x03, 0x73, 0xb2, 0x1f, 0x5d, 0xe2, 0xf6, 0x1d, 0xd4, 0x82, 0x82, 0xc3, 0x7f, 0x09, - 0x5f, 0x5e, 0x4b, 0x57, 0xc2, 0x3c, 0xe9, 0xda, 0x8c, 0xd0, 0x5e, 0xf0, 0xfe, 0x63, 0x81, 0x85, - 0x1a, 0x90, 0xe7, 0xeb, 0x0e, 0x7c, 0x9b, 0x72, 0x0b, 0xd5, 0x26, 0x0f, 0xf6, 0x17, 0xbd, 0xf2, - 0x8a, 0x3d, 0x04, 0xbf, 0x54, 0x67, 0x87, 0x94, 0xea, 0x6f, 0xc1, 0x64, 0x37, 0xd8, 0xb0, 0x39, - 0xbe, 0x61, 0xd3, 0x6b, 0x0b, 0xda, 0x88, 0x70, 0x77, 0x86, 0x68, 0xea, 0x7b, 0x0a, 0x40, 0x98, - 0x92, 0x83, 0xae, 0x42, 0x19, 0xda, 0x55, 0x5c, 0x86, 0x9c, 0x63, 0x3c, 0xf6, 0x16, 0x9d, 0x0d, - 0xc1, 0xb9, 0xf8, 0x86, 0xf1, 0x98, 0x62, 0x4e, 0x66, 0xfd, 0x4c, 0x37, 0xc8, 0x87, 0xd9, 0x68, - 0x3f, 0x13, 0x26, 0xbf, 0x90, 0x47, 0x6d, 0xc3, 0x4c, 0x38, 0x8f, 0x3a, 0x2b, 0xa4, 0x17, 0x85, - 0x26, 0x85, 0x6b, 0x3a, 0x7d, 0xa4, 0x96, 0x4c, 0x0a, 0x2d, 0xbf, 0x57, 0x60, 0xd2, 0x53, 0x63, - 0x38, 0x2e, 0x7a, 0x34, 0xd0, 0xdc, 0x54, 0xd2, 0x45, 0x06, 0x93, 0xe6, 0xad, 0x4d, 0xd0, 0xd2, - 0xf9, 0x23, 0x52, 0x63, 0xd3, 0x84, 0xbc, 0xe1, 0xd2, 0xae, 0x53, 0xca, 0x8c, 0xe8, 0xb1, 0xd3, - 0x02, 0x34, 0xdf, 0x60, 0xe2, 0xd8, 0x43, 0x51, 0x57, 0x45, 0x64, 0xaf, 0x59, 0xd6, 0x4e, 0xbf, - 0x27, 0xb6, 0xcc, 0x25, 0xc8, 0x77, 0x58, 0xfa, 0x10, 0x29, 0x33, 0x90, 0xe4, 0x39, 0x05, 0x7b, - 0x34, 0xf5, 0x17, 0x19, 0x38, 0x1d, 0x2d, 0xf8, 0x57, 0xa0, 0xd0, 0x36, 0x74, 0xb6, 0xc1, 0x3c, - 0x47, 0x07, 0x21, 0x5e, 0xe7, 0xa3, 0x58, 0x50, 0x47, 0xb6, 0x2f, 0xcb, 0xe4, 0x7e, 0x6c, 0x31, - 0x37, 0xf1, 0x69, 0x65, 0xc3, 0xb4, 0xd3, 0x94, 0x68, 0x38, 0xc2, 0xc9, 0x24, 0x89, 0xad, 0x6d, - 0x1b, 0x2e, 0xd5, 0x58, 0x91, 0x15, 0x8d, 0x52, 0x20, 0x79, 0x5b, 0xa2, 0xe1, 0x08, 0x27, 0x6b, - 0x64, 0x2d, 0x27, 0xde, 0xc8, 0xde, 0xdf, 0xc0, 0x19, 0xcb, 0x41, 0xaf, 0xc0, 0xc4, 0x2e, 0xb1, - 0x0d, 0x62, 0xba, 0xa5, 0x02, 0x67, 0x98, 0x15, 0x0c, 0x13, 0x0f, 0xbc, 0x61, 0xec, 0xd3, 0xd5, - 0xdf, 0x16, 0x44, 0x04, 0x06, 0x85, 0x7e, 0x0c, 0xcd, 0xef, 0x12, 0xe4, 0xdc, 0xd0, 0xb6, 0xc1, - 0x7e, 0xe3, 0x66, 0xe5, 0x14, 0x74, 0x19, 0x26, 0x34, 0xcb, 0x74, 0xa9, 0xe9, 0x72, 0x63, 0x4e, - 0xd7, 0xa6, 0xd8, 0xec, 0xef, 0x78, 0x43, 0xd8, 0xa7, 0x21, 0x03, 0x40, 0xb3, 0xcc, 0xb6, 0xe1, - 0x1a, 0x96, 0xe9, 0xe7, 0x88, 0x34, 0x09, 0x3b, 0x58, 0xec, 0x1d, 0x5f, 0x3a, 0x9c, 0x71, 0x30, - 0xe4, 0x60, 0x09, 0x1c, 0x7d, 0x19, 0x4e, 0x73, 0xf1, 0x46, 0x9b, 0x9a, 0xae, 0xe1, 0xee, 0x09, - 0xd3, 0xcf, 0x0b, 0x31, 0x2f, 0xd4, 0x7c, 0x22, 0x8e, 0xf2, 0xa2, 0x1f, 0xc0, 0x34, 0xeb, 0xcc, - 0x68, 0xfb, 0x4e, 0x87, 0x18, 0x5d, 0xbf, 0xcb, 0xbc, 0x33, 0x72, 0xd3, 0xc7, 0x27, 0xee, 0xa3, - 0xdc, 0x35, 0x5d, 0x5b, 0x2a, 0x6e, 0x32, 0x09, 0x47, 0xd4, 0xa1, 0xb7, 0x61, 0x42, 0xb3, 0x29, - 0x3b, 0xbe, 0x95, 0x26, 0xb8, 0x43, 0x3f, 0x9f, 0xce, 0xa1, 0x2d, 0xa3, 0x4b, 0x85, 0xe5, 0x3d, - 0x71, 0xec, 0xe3, 0xb0, 0x24, 0x62, 0x38, 0x4e, 0x9f, 0xb6, 0x6b, 0x7b, 0xa5, 0x62, 0xea, 0xca, - 0x1c, 0x2c, 0xa4, 0xc1, 0x64, 0xed, 0xda, 0x34, 0x4b, 0x22, 0x0d, 0x81, 0x83, 0x03, 0x44, 0xf4, - 0x6d, 0x1f, 0xbd, 0x65, 0xf1, 0xb6, 0x72, 0x6a, 0xe5, 0x8b, 0xa3, 0xa0, 0x6f, 0xf4, 0x79, 0xd4, - 0xc9, 0xf0, 0x2d, 0x0b, 0x07, 0x90, 0xe5, 0x5b, 0x30, 0x37, 0x60, 0x48, 0x74, 0x06, 0xb2, 0x3b, - 0x54, 0x1c, 0x5a, 0x31, 0xfb, 0x89, 0xce, 0x41, 0x7e, 0x97, 0x74, 0xfa, 0x22, 0x4e, 0xb1, 0xf7, - 0xe7, 0x66, 0x66, 0x55, 0x61, 0xb9, 0x65, 0xca, 0xf3, 0x8c, 0x6b, 0x53, 0xd2, 0x1d, 0xc3, 0x96, - 0x69, 0x41, 0xce, 0xe9, 0x51, 0x4d, 0x54, 0xdd, 0x95, 0xd4, 0x91, 0xc3, 0xe7, 0xc7, 0x1a, 0xbb, - 0x70, 0x9b, 0xb1, 0x7f, 0x98, 0xa3, 0xa1, 0x47, 0x41, 0x8b, 0xe0, 0x75, 0x57, 0xd7, 0x47, 0xc4, - 0x3d, 0xb4, 0x55, 0x50, 0xff, 0xa8, 0xc0, 0x19, 0x89, 0x7b, 0x5c, 0x47, 0xeb, 0xe6, 0x71, 0x3b, - 0x94, 0xb0, 0x02, 0x49, 0x5d, 0x8a, 0xfa, 0x3b, 0xbf, 0xb9, 0xf2, 0x57, 0xc1, 0x5a, 0xac, 0x31, - 0x2c, 0xe3, 0x61, 0xc4, 0xe3, 0xab, 0xa3, 0x79, 0x26, 0x6c, 0xe8, 0x13, 0xfd, 0xbe, 0x19, 0xf3, - 0xfb, 0xcd, 0x63, 0xa1, 0x1f, 0xee, 0xfd, 0x1f, 0x67, 0x60, 0x3e, 0x71, 0x46, 0xac, 0x0e, 0x7b, - 0xbd, 0x37, 0xb7, 0x5c, 0x31, 0x44, 0xf0, 0x78, 0xb0, 0xa0, 0x22, 0x1d, 0xc0, 0xa6, 0x3d, 0xcb, - 0x31, 0x5c, 0xcb, 0xde, 0x13, 0x76, 0xf8, 0x52, 0x8a, 0x99, 0xe2, 0x40, 0x48, 0x32, 0xc3, 0x0c, - 0x33, 0x74, 0x48, 0xc1, 0x12, 0x34, 0x7a, 0xc8, 0x26, 0x44, 0x74, 0xca, 0xcc, 0x91, 0x1d, 0x65, - 0x7b, 0xc9, 0xf8, 0xe1, 0x22, 0x18, 0x12, 0x16, 0x88, 0xea, 0x47, 0x19, 0x78, 0x71, 0x88, 0xe9, - 0x10, 0x8e, 0x18, 0x82, 0xf5, 0x61, 0x23, 0xb9, 0xc1, 0x3b, 0xd3, 0xc5, 0x8c, 0x66, 0x24, 0x18, - 0xed, 0xc6, 0x71, 0x8c, 0x26, 0xbc, 0x7b, 0x88, 0xd9, 0x1e, 0xc5, 0xcc, 0x76, 0x7d, 0x44, 0xb3, - 0xc5, 0xe2, 0x27, 0x66, 0xb8, 0x0f, 0x73, 0x91, 0x7d, 0x27, 0x2e, 0x4f, 0x4e, 0x7e, 0xdf, 0xb5, - 0x21, 0xbf, 0xd9, 0xb1, 0x36, 0xfd, 0x06, 0xf6, 0xd6, 0x68, 0x3e, 0xf1, 0xa6, 0x59, 0x61, 0x47, - 0x7d, 0x51, 0xa0, 0x83, 0xac, 0xc2, 0xc7, 0xb0, 0x07, 0x8e, 0xb6, 0x63, 0xb6, 0x7b, 0xf3, 0x58, - 0x6a, 0x3c, 0x93, 0x79, 0x7a, 0x86, 0xd8, 0xb1, 0xbc, 0x03, 0x10, 0xce, 0x26, 0xa1, 0xca, 0xdd, - 0x93, 0xab, 0xdc, 0x08, 0x37, 0x51, 0xc1, 0x91, 0x45, 0x2a, 0x8c, 0xe5, 0xef, 0x89, 0xba, 0x38, - 0x54, 0xdb, 0x5a, 0x54, 0xdb, 0x1b, 0xa9, 0x93, 0x73, 0xe4, 0xee, 0x44, 0xae, 0xc5, 0x7f, 0x52, - 0xc4, 0x25, 0x86, 0xb0, 0xcc, 0xc9, 0x1f, 0x71, 0x36, 0xa2, 0x47, 0x9c, 0x51, 0x77, 0x6d, 0xf2, - 0x41, 0xe7, 0x1f, 0x0a, 0x20, 0x89, 0xab, 0x49, 0x7a, 0x3d, 0xc3, 0xd4, 0xff, 0xef, 0xca, 0xe5, - 0x11, 0x87, 0x7a, 0xf5, 0x57, 0x99, 0x88, 0xb7, 0x78, 0x3d, 0x30, 0x61, 0xba, 0x23, 0x1d, 0xef, - 0x46, 0xed, 0x45, 0xe4, 0xa3, 0x61, 0xd8, 0x0e, 0xcb, 0xa3, 0x38, 0x82, 0x8f, 0x36, 0x22, 0x37, - 0xa3, 0x61, 0x72, 0x13, 0xc7, 0xc2, 0x97, 0x05, 0xc4, 0x7c, 0x3d, 0x89, 0x09, 0x27, 0xcb, 0xa2, - 0xb7, 0x21, 0xe7, 0x12, 0xdd, 0x8f, 0x89, 0xea, 0x88, 0xb7, 0x46, 0xd2, 0x21, 0x88, 0xe8, 0x0e, - 0xe6, 0x50, 0xea, 0x2f, 0xa3, 0x9d, 0x87, 0x28, 0x1a, 0x27, 0x32, 0x7b, 0x0a, 0xe7, 0x7b, 0xfd, - 0xcd, 0x8e, 0xa1, 0x25, 0x4a, 0x09, 0x6f, 0x5e, 0x12, 0xd0, 0xe7, 0xd7, 0x87, 0xb3, 0xe2, 0xc3, - 0x70, 0xd0, 0x83, 0x88, 0x91, 0xd2, 0x78, 0xf8, 0x2d, 0xd2, 0xa5, 0xed, 0x16, 0xd1, 0xef, 0xee, - 0x52, 0xd3, 0x65, 0x7b, 0x31, 0xd1, 0x52, 0x1f, 0xe4, 0xfc, 0x53, 0x2c, 0xb7, 0x54, 0x8b, 0x8c, - 0x63, 0xe3, 0x7c, 0xcd, 0x8b, 0x74, 0x6f, 0xdb, 0x8c, 0xec, 0xf0, 0x89, 0xc8, 0x5d, 0xd7, 0x0a, - 0x80, 0x78, 0x62, 0x33, 0x2c, 0x53, 0xdc, 0x1f, 0x04, 0xda, 0xef, 0x05, 0x14, 0x2c, 0x71, 0x0d, - 0x6c, 0x9b, 0xc2, 0x09, 0x6f, 0x9b, 0xed, 0x84, 0xc3, 0xf6, 0xf5, 0x74, 0xcb, 0xe6, 0xde, 0x4b, - 0x7f, 0xd6, 0x0e, 0x52, 0x52, 0xfe, 0xb9, 0x74, 0xf0, 0x7f, 0x89, 0xa6, 0xd6, 0x16, 0xd1, 0xc7, - 0x50, 0x24, 0x1e, 0x44, 0x8b, 0xc4, 0xf2, 0x68, 0x45, 0xa2, 0x45, 0xf4, 0x21, 0x75, 0xe2, 0xb3, - 0x0c, 0x14, 0x39, 0xe3, 0x78, 0x82, 0xbc, 0x19, 0x39, 0x85, 0x8c, 0x1c, 0xe5, 0xc5, 0xd8, 0xc1, - 0xe3, 0x9b, 0xc7, 0x38, 0x70, 0x0e, 0xa6, 0x00, 0x38, 0xec, 0x5e, 0x3a, 0xf7, 0x9f, 0xde, 0x4b, - 0xab, 0x7f, 0x50, 0x60, 0xda, 0x37, 0xf1, 0x18, 0x22, 0x65, 0x3d, 0x1a, 0x29, 0x5f, 0x48, 0x3b, - 0xf3, 0xe1, 0x31, 0xf2, 0x4f, 0x05, 0xe6, 0x06, 0xac, 0xe6, 0x57, 0x66, 0x65, 0xc8, 0x75, 0xfb, - 0x31, 0xa6, 0xe1, 0xc3, 0x27, 0x4f, 0x23, 0x96, 0x30, 0xb2, 0x27, 0x97, 0x30, 0xd4, 0xf7, 0xb3, - 0x70, 0x2e, 0xe9, 0xd4, 0xf7, 0xbc, 0x5e, 0xb3, 0xe2, 0x6f, 0x51, 0x99, 0x71, 0xbf, 0x45, 0xe5, - 0xfe, 0x6b, 0x6f, 0x51, 0xd9, 0x11, 0xdf, 0xa2, 0xde, 0xcf, 0xc0, 0x0b, 0xc9, 0x67, 0xc9, 0x13, - 0x7a, 0x90, 0x0a, 0x4f, 0xa1, 0x99, 0xe7, 0x7f, 0x0a, 0x45, 0x37, 0x61, 0x86, 0xb4, 0xbd, 0x30, - 0x23, 0x1d, 0xd6, 0x71, 0xf0, 0x38, 0x9e, 0xac, 0xa1, 0x83, 0xfd, 0xc5, 0x99, 0xdb, 0x11, 0x0a, - 0x8e, 0x71, 0xaa, 0xbf, 0x56, 0x00, 0x36, 0xa8, 0x66, 0x53, 0x77, 0x0c, 0x59, 0xe4, 0x56, 0x74, - 0xfb, 0x96, 0x93, 0x42, 0xdd, 0x9b, 0xcc, 0x90, 0xa4, 0xf1, 0x49, 0x16, 0xd0, 0xe0, 0xbd, 0x38, - 0xba, 0x29, 0xee, 0xea, 0xbd, 0xb4, 0x71, 0x45, 0xbe, 0xab, 0x7f, 0xb6, 0xbf, 0xf8, 0xc2, 0xa0, - 0x84, 0x74, 0x8b, 0xbf, 0x16, 0x38, 0xdc, 0xbb, 0xe9, 0xbf, 0x1e, 0x75, 0xe1, 0xb3, 0xfd, 0xc5, - 0x84, 0x4f, 0xa1, 0x2a, 0x01, 0x52, 0xcc, 0xd1, 0x3a, 0x9c, 0xee, 0x10, 0xc7, 0x5d, 0xb7, 0xad, - 0x4d, 0xda, 0x32, 0xc4, 0x47, 0x40, 0xa3, 0xdd, 0x65, 0x07, 0xb7, 0xf5, 0x6b, 0x32, 0x10, 0x8e, - 0xe2, 0xa2, 0x5d, 0x40, 0x6c, 0xa0, 0x65, 0x13, 0xd3, 0xf1, 0x96, 0xc4, 0xb4, 0xe5, 0x46, 0xd6, - 0x56, 0x16, 0xda, 0xd0, 0xda, 0x00, 0x1a, 0x4e, 0xd0, 0x80, 0xae, 0x40, 0xc1, 0xa6, 0xc4, 0xb1, - 0x4c, 0xf1, 0xb6, 0x10, 0xc4, 0x24, 0xe6, 0xa3, 0x58, 0x50, 0xd1, 0x2b, 0x30, 0xd1, 0xa5, 0x8e, - 0xc3, 0x8a, 0x5d, 0xec, 0x79, 0xa7, 0xe9, 0x0d, 0x63, 0x9f, 0xae, 0xbe, 0xa7, 0x40, 0xe8, 0x22, - 0xde, 0x47, 0x1a, 0xda, 0x5d, 0xef, 0x4d, 0x62, 0x15, 0xa6, 0x2d, 0x5b, 0x27, 0xa6, 0xf1, 0xd8, - 0x6b, 0x3a, 0x95, 0xe8, 0xd3, 0xd3, 0x7d, 0x89, 0x86, 0x23, 0x9c, 0xac, 0x59, 0xd5, 0xac, 0x6e, - 0xd7, 0x32, 0x59, 0x8d, 0x11, 0xae, 0x95, 0x32, 0xb4, 0x4f, 0xc1, 0x12, 0x97, 0xfa, 0xa1, 0x02, - 0xb3, 0xb1, 0xdb, 0x7f, 0xf4, 0x33, 0x05, 0x5e, 0x70, 0x12, 0x27, 0x27, 0xf6, 0xc7, 0x8d, 0x51, - 0x2e, 0xfd, 0x23, 0x00, 0xb5, 0x05, 0x31, 0x9f, 0x21, 0xab, 0xc7, 0x43, 0x14, 0xab, 0x7f, 0x53, - 0xe0, 0x4c, 0xfc, 0x1d, 0xe1, 0x7f, 0x71, 0xa2, 0xe8, 0x75, 0x98, 0xf2, 0x4e, 0x5a, 0x5f, 0xa7, - 0x7b, 0x8d, 0xba, 0xf0, 0xc2, 0x59, 0x01, 0x36, 0xb5, 0x1e, 0x92, 0xb0, 0xcc, 0xa7, 0xfe, 0x24, - 0x03, 0x45, 0xbf, 0xbe, 0xa2, 0x6f, 0x84, 0xef, 0x42, 0xca, 0xc8, 0xd1, 0x1d, 0x04, 0xdd, 0xc0, - 0xdb, 0xd0, 0xf3, 0xff, 0xb6, 0xed, 0x92, 0xdf, 0xdc, 0x79, 0x07, 0xd1, 0xe4, 0x9b, 0x87, 0xe8, - 0x19, 0x2a, 0x97, 0xe6, 0x0c, 0xa5, 0x7e, 0x90, 0x85, 0xb9, 0x81, 0x76, 0x03, 0xdd, 0x88, 0xe4, - 0xbc, 0xcb, 0xb1, 0x9c, 0x37, 0x3f, 0x20, 0x70, 0x62, 0x29, 0x2f, 0x39, 0x13, 0x65, 0xc7, 0x98, - 0x89, 0x72, 0x69, 0x33, 0x51, 0xfe, 0xf0, 0x4c, 0x14, 0xf3, 0x4e, 0x21, 0x95, 0x77, 0x3e, 0x52, - 0x60, 0x36, 0xd6, 0x40, 0xa1, 0x6b, 0x50, 0x34, 0x4c, 0x87, 0x6a, 0x7d, 0x9b, 0x8a, 0xe7, 0x83, - 0xa0, 0x2a, 0x36, 0xc4, 0x38, 0x0e, 0x38, 0x50, 0x15, 0x26, 0x1d, 0x6d, 0x9b, 0xb6, 0xfb, 0x1d, - 0xda, 0xe6, 0x1e, 0x29, 0x86, 0x4f, 0xf9, 0x1b, 0x3e, 0x01, 0x87, 0x3c, 0xa8, 0x0e, 0xe0, 0xf5, - 0x62, 0x4d, 0xab, 0xed, 0x87, 0x9b, 0xff, 0x49, 0x1b, 0x34, 0x02, 0xca, 0xb3, 0xfd, 0xc5, 0x99, - 0xf0, 0x1f, 0xf7, 0xbf, 0x24, 0xa7, 0xfe, 0x2b, 0x07, 0xd3, 0x72, 0x23, 0x96, 0xe2, 0x0b, 0x93, - 0x77, 0x60, 0x8a, 0x98, 0xa6, 0xe5, 0x12, 0xaf, 0x5b, 0xce, 0xa4, 0xbe, 0x15, 0x96, 0xf5, 0x54, - 0x6e, 0x87, 0x10, 0xde, 0xad, 0x70, 0x90, 0x11, 0x24, 0x0a, 0x96, 0x35, 0xa1, 0xdb, 0xa2, 0x45, - 0xce, 0xa6, 0x6f, 0x91, 0x8b, 0xb1, 0xf6, 0xb8, 0x0a, 0x93, 0x41, 0x27, 0x29, 0x3e, 0x5e, 0x0a, - 0xac, 0x1c, 0x6e, 0xed, 0x90, 0x07, 0x55, 0x22, 0xc1, 0x90, 0xe7, 0xc1, 0x30, 0x73, 0xc8, 0x55, - 0x47, 0xbc, 0xff, 0x2e, 0x8c, 0xbb, 0xff, 0x9e, 0x18, 0x4b, 0xff, 0x5d, 0xfe, 0x0a, 0x9c, 0x89, - 0x7b, 0x70, 0xa4, 0x77, 0xe9, 0x75, 0x40, 0x83, 0xfa, 0x8f, 0x6a, 0xe1, 0x06, 0x25, 0xc2, 0x7c, - 0x56, 0xbb, 0xf7, 0xe4, 0xe9, 0xc2, 0xa9, 0x8f, 0x9f, 0x2e, 0x9c, 0xfa, 0xf4, 0xe9, 0xc2, 0xa9, - 0x1f, 0x1e, 0x2c, 0x28, 0x4f, 0x0e, 0x16, 0x94, 0x8f, 0x0f, 0x16, 0x94, 0x4f, 0x0f, 0x16, 0x94, - 0xcf, 0x0e, 0x16, 0x94, 0x9f, 0xfe, 0x7d, 0xe1, 0xd4, 0xc3, 0x8b, 0x47, 0x7e, 0x56, 0xff, 0xef, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, 0x51, 0xcf, 0x5f, 0x7a, 0x2f, 0x00, 0x00, + // 2691 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7, + 0x15, 0xf6, 0xf2, 0x4f, 0xd4, 0x13, 0x25, 0x59, 0x63, 0xcb, 0x61, 0x68, 0x47, 0x92, 0xd7, 0xb5, + 0xe1, 0x34, 0x0e, 0x19, 0xa9, 0x4e, 0x2a, 0xbb, 0x40, 0x1d, 0xd3, 0x74, 0x0d, 0xb6, 0x62, 0xac, + 0x8c, 0x58, 0xa3, 0x35, 0x5c, 0xa0, 0xab, 0xe5, 0x68, 0xb5, 0x15, 0xb9, 0xcb, 0xee, 0x2e, 0x95, + 0xc8, 0x68, 0x81, 0xa2, 0x28, 0x82, 0x1c, 0x7a, 0x68, 0xcf, 0x39, 0x16, 0x41, 0x51, 0x14, 0xe8, + 0xa5, 0x68, 0xd0, 0x53, 0x2f, 0x4d, 0x01, 0xa3, 0xa7, 0x20, 0xe8, 0x21, 0x97, 0x0a, 0xb1, 0xda, + 0x73, 0x6f, 0xbd, 0xf8, 0x54, 0xcc, 0xcf, 0xfe, 0x72, 0x29, 0xed, 0xaa, 0x16, 0xdb, 0xdc, 0xc8, + 0x79, 0xef, 0x7d, 0x6f, 0xe6, 0xbd, 0x37, 0xef, 0xbd, 0x99, 0x59, 0x58, 0xd6, 0x74, 0x67, 0x7b, + 0xb0, 0x59, 0x55, 0xcd, 0x5e, 0xcd, 0xec, 0x13, 0xc3, 0xde, 0xd6, 0xb7, 0x9c, 0x9a, 0xd2, 0xd7, + 0x6b, 0x7a, 0x4f, 0xd1, 0x48, 0x6d, 0x77, 0xb9, 0xa6, 0x11, 0x83, 0x58, 0x8a, 0x43, 0x3a, 0xd5, + 0xbe, 0x65, 0x3a, 0x26, 0xba, 0xe8, 0x8b, 0x54, 0x3d, 0x91, 0xaa, 0xd2, 0xd7, 0xab, 0x4c, 0xa4, + 0xba, 0xbb, 0x5c, 0x79, 0x35, 0x80, 0xaa, 0x99, 0x9a, 0x59, 0x63, 0x92, 0x9b, 0x83, 0x2d, 0xf6, + 0x8f, 0xfd, 0x61, 0xbf, 0x38, 0x62, 0x45, 0xde, 0x59, 0xb5, 0xab, 0xba, 0xc9, 0xd4, 0xaa, 0xa6, + 0x15, 0xa7, 0xb5, 0x72, 0xdd, 0xe7, 0xe9, 0x29, 0xea, 0xb6, 0x6e, 0x10, 0x6b, 0xaf, 0xd6, 0xdf, + 0xd1, 0xe8, 0x80, 0x5d, 0xeb, 0x11, 0x47, 0x89, 0x93, 0xaa, 0x8d, 0x92, 0xb2, 0x06, 0x86, 0xa3, + 0xf7, 0xc8, 0x90, 0xc0, 0x1b, 0x47, 0x09, 0xd8, 0xea, 0x36, 0xe9, 0x29, 0x51, 0x39, 0xf9, 0x53, + 0x09, 0xce, 0x36, 0x4c, 0x75, 0x87, 0x58, 0x4d, 0x6a, 0x04, 0x4c, 0xb6, 0x88, 0x45, 0x0c, 0x95, + 0xa0, 0x6b, 0x50, 0xb4, 0x88, 0xa6, 0xdb, 0x8e, 0xb5, 0x57, 0x96, 0x96, 0xa4, 0xab, 0x93, 0xf5, + 0xd3, 0x4f, 0xf6, 0x17, 0x4f, 0x1d, 0xec, 0x2f, 0x16, 0xb1, 0x18, 0xc7, 0x1e, 0x07, 0xaa, 0xc1, + 0xa4, 0xa1, 0xf4, 0x88, 0xdd, 0x57, 0x54, 0x52, 0xce, 0x30, 0xf6, 0x39, 0xc1, 0x3e, 0xf9, 0x96, + 0x4b, 0xc0, 0x3e, 0x0f, 0x5a, 0x82, 0x1c, 0xfd, 0x53, 0xce, 0x32, 0xde, 0x92, 0xe0, 0xcd, 0x51, + 0x5e, 0xcc, 0x28, 0xe8, 0x25, 0xc8, 0x3a, 0x8a, 0x56, 0xce, 0x31, 0x86, 0x29, 0xc1, 0x90, 0x6d, + 0x2b, 0x1a, 0xa6, 0xe3, 0xa8, 0x02, 0x19, 0xbd, 0x51, 0xce, 0x33, 0x2a, 0x08, 0x6a, 0xa6, 0xd9, + 0xc0, 0x19, 0xbd, 0x21, 0xff, 0xad, 0x08, 0x79, 0xb6, 0x1c, 0xf4, 0x7d, 0x28, 0x52, 0x13, 0x77, + 0x14, 0x47, 0x61, 0xab, 0x98, 0x5a, 0x79, 0xad, 0xca, 0x2d, 0x55, 0x0d, 0x5a, 0xaa, 0xda, 0xdf, + 0xd1, 0xe8, 0x80, 0x5d, 0xa5, 0xdc, 0xd5, 0xdd, 0xe5, 0xea, 0xfd, 0xcd, 0x1f, 0x10, 0xd5, 0x69, + 0x11, 0x47, 0xa9, 0x23, 0x81, 0x0e, 0xfe, 0x18, 0xf6, 0x50, 0xd1, 0x3a, 0x9c, 0xed, 0xc4, 0xd8, + 0x4f, 0x18, 0xe1, 0x82, 0x90, 0x8d, 0xb5, 0x31, 0x8e, 0x95, 0x44, 0x3f, 0x82, 0x33, 0x81, 0xf1, + 0x96, 0x3b, 0xfd, 0x2c, 0x9b, 0xfe, 0xab, 0x23, 0xa7, 0x2f, 0x1c, 0x5d, 0xc5, 0xca, 0x3b, 0x77, + 0xdf, 0x75, 0x88, 0x61, 0xeb, 0xa6, 0x51, 0x3f, 0x2f, 0xf4, 0x9f, 0x69, 0x0c, 0x23, 0xe2, 0x38, + 0x35, 0x68, 0x13, 0x2a, 0x31, 0xc3, 0x0f, 0x88, 0x45, 0xf1, 0x84, 0x37, 0x64, 0x81, 0x5a, 0x69, + 0x8c, 0xe4, 0xc4, 0x87, 0xa0, 0xa0, 0x56, 0x78, 0x85, 0x8a, 0xa1, 0x6f, 0x11, 0xdb, 0x11, 0xce, + 0x8c, 0x9d, 0xb2, 0x60, 0xc1, 0x71, 0x72, 0x68, 0x17, 0xe6, 0x02, 0xc3, 0x6b, 0xca, 0x1e, 0xb1, + 0xec, 0x72, 0x61, 0x29, 0xcb, 0xcc, 0x75, 0xe4, 0xa6, 0xaf, 0xfa, 0x52, 0xf5, 0x17, 0x85, 0xee, + 0xb9, 0x46, 0x14, 0x0f, 0x0f, 0xab, 0x40, 0x04, 0xc0, 0xd6, 0x35, 0x43, 0x71, 0x06, 0x16, 0xb1, + 0xcb, 0x13, 0x4c, 0xe1, 0x72, 0x52, 0x85, 0x1b, 0xae, 0xa4, 0x1f, 0x5f, 0xde, 0x90, 0x8d, 0x03, + 0xc0, 0xe8, 0x3e, 0xcc, 0x07, 0x74, 0xfb, 0x4c, 0xe5, 0xe2, 0x52, 0xf6, 0x6a, 0xa9, 0xfe, 0xe2, + 0xc1, 0xfe, 0xe2, 0x7c, 0x23, 0x8e, 0x01, 0xc7, 0xcb, 0xa1, 0x6d, 0xb8, 0x10, 0x63, 0xc6, 0x16, + 0xe9, 0xe8, 0x4a, 0x7b, 0xaf, 0x4f, 0xca, 0x93, 0xcc, 0x0f, 0x5f, 0x12, 0xd3, 0xba, 0xd0, 0x38, + 0x84, 0x17, 0x1f, 0x8a, 0x84, 0xee, 0x85, 0x3c, 0x73, 0xc7, 0x34, 0xb6, 0x74, 0xad, 0x0c, 0x0c, + 0x3e, 0xce, 0xd4, 0x9c, 0x01, 0x0f, 0xcb, 0xa0, 0x9f, 0x4a, 0xa1, 0x6d, 0xe6, 0x6a, 0xb2, 0xcb, + 0x53, 0xcc, 0xea, 0xaf, 0x25, 0xb5, 0xba, 0x2b, 0x18, 0xbb, 0x31, 0x3d, 0x54, 0x1c, 0xab, 0x4b, + 0xfe, 0x58, 0x82, 0x33, 0x6c, 0xa8, 0xde, 0x35, 0x37, 0xbd, 0xfd, 0x6a, 0xa3, 0x55, 0x28, 0x31, + 0x2d, 0x2d, 0xdd, 0xb6, 0x75, 0x43, 0x63, 0x3b, 0xb5, 0x58, 0x3f, 0x2b, 0x34, 0x94, 0x9a, 0x01, + 0x1a, 0x0e, 0x71, 0x22, 0x19, 0x0a, 0x5d, 0x1e, 0xae, 0xd2, 0x52, 0x96, 0x26, 0xb2, 0x83, 0xfd, + 0xc5, 0x82, 0x08, 0x38, 0x41, 0xa1, 0x3c, 0x2a, 0x37, 0x1c, 0x4f, 0x29, 0x8c, 0x47, 0x58, 0x4a, + 0x50, 0xd0, 0x2b, 0x30, 0xd9, 0xf3, 0x4c, 0x92, 0x63, 0x50, 0xd3, 0x34, 0xf5, 0xfa, 0x2b, 0xf2, + 0xe9, 0xf2, 0x5f, 0xb2, 0x30, 0xcb, 0xe6, 0xd4, 0xec, 0xf5, 0x4d, 0xcb, 0xd9, 0xe8, 0x13, 0x15, + 0xdd, 0x85, 0xdc, 0x96, 0x65, 0xf6, 0x44, 0x8e, 0xbc, 0x14, 0x48, 0x32, 0x55, 0x5a, 0xd8, 0xfc, + 0x8c, 0xe8, 0x2d, 0xdb, 0xcf, 0xd9, 0xdf, 0xb0, 0xcc, 0x1e, 0x66, 0xe2, 0xe8, 0x4d, 0xc8, 0x38, + 0x26, 0x9b, 0xe7, 0xd4, 0xca, 0xd5, 0x38, 0x90, 0x35, 0x53, 0x55, 0xba, 0x51, 0xa4, 0x02, 0x4d, + 0xdd, 0x6d, 0x13, 0x67, 0x1c, 0x13, 0x75, 0xa9, 0x2d, 0xe9, 0xb4, 0xd6, 0xcd, 0xae, 0xae, 0xee, + 0x89, 0xac, 0xb7, 0x92, 0xc0, 0xbf, 0x6d, 0x45, 0x6b, 0x06, 0x24, 0x83, 0xf6, 0xf7, 0x47, 0x71, + 0x08, 0x1d, 0xbd, 0x0b, 0xb3, 0x96, 0x3b, 0x0d, 0xa1, 0x30, 0xcf, 0x14, 0xbe, 0x9e, 0x4c, 0x21, + 0x0e, 0x0b, 0xd7, 0x5f, 0x10, 0x3a, 0x67, 0x23, 0x04, 0x1c, 0x55, 0x83, 0x6e, 0xc3, 0xac, 0x6e, + 0xa8, 0xdd, 0x41, 0xc7, 0x4f, 0x7f, 0x39, 0x16, 0x36, 0x1e, 0x44, 0x33, 0x4c, 0xc6, 0x51, 0x7e, + 0xf9, 0x77, 0x19, 0x98, 0x0b, 0xfa, 0xd1, 0x51, 0x9c, 0x81, 0x8d, 0xda, 0x50, 0xb0, 0xd9, 0x2f, + 0xe1, 0xcb, 0x6b, 0xc9, 0xea, 0x1d, 0x97, 0xae, 0xcf, 0x08, 0xed, 0x05, 0xfe, 0x1f, 0x0b, 0x2c, + 0xd4, 0x84, 0x3c, 0x5b, 0xb7, 0xe7, 0xdb, 0x84, 0xfb, 0xad, 0x3e, 0x79, 0xb0, 0xbf, 0xc8, 0x6b, + 0x31, 0xe6, 0x08, 0x6e, 0x5d, 0xcf, 0x8e, 0xa8, 0xeb, 0xdf, 0x8d, 0x86, 0x72, 0x1a, 0x6d, 0x5e, + 0xcf, 0x11, 0x1b, 0xf8, 0xef, 0x49, 0x00, 0x7e, 0xfe, 0xf6, 0x5a, 0x10, 0x69, 0x64, 0x0b, 0x72, + 0x19, 0x72, 0xb6, 0xfe, 0x98, 0x2f, 0x3a, 0xeb, 0x83, 0x33, 0xf1, 0x0d, 0xfd, 0x31, 0xc1, 0x8c, + 0x4c, 0x9b, 0x9f, 0x9e, 0x97, 0x3c, 0xb3, 0xe1, 0xe6, 0xc7, 0xcf, 0x94, 0x3e, 0x8f, 0xdc, 0x81, + 0x19, 0x7f, 0x1e, 0x0d, 0x5a, 0x75, 0x2f, 0x0a, 0x4d, 0x12, 0xd3, 0x34, 0x7d, 0xa4, 0x96, 0x4c, + 0x02, 0x2d, 0x7f, 0x94, 0x60, 0x92, 0xab, 0xd1, 0x6d, 0x07, 0x3d, 0x1a, 0xea, 0x84, 0xaa, 0xc9, + 0x22, 0x83, 0x4a, 0xb3, 0x3e, 0xc8, 0xeb, 0xff, 0xdc, 0x91, 0x40, 0x17, 0xd4, 0x82, 0xbc, 0xee, + 0x90, 0x9e, 0x5d, 0xce, 0xa4, 0xf4, 0xd8, 0xb4, 0x00, 0xcd, 0x37, 0xa9, 0x38, 0xe6, 0x28, 0xf2, + 0xaa, 0x88, 0xec, 0x35, 0xd3, 0xdc, 0x19, 0xf4, 0xc5, 0x96, 0xb9, 0x04, 0xf9, 0x2e, 0x4d, 0x1f, + 0x22, 0xbf, 0x7a, 0x92, 0x2c, 0xa7, 0x60, 0x4e, 0x93, 0x7f, 0x95, 0x81, 0xe9, 0x70, 0x77, 0x70, + 0x05, 0x0a, 0x1d, 0x5d, 0xa3, 0x1b, 0x8c, 0x3b, 0xda, 0x0b, 0xf1, 0x06, 0x1b, 0xc5, 0x82, 0x9a, + 0xda, 0xbe, 0x34, 0xed, 0xbb, 0xb1, 0x45, 0xdd, 0xc4, 0xa6, 0x95, 0xf5, 0xd3, 0x4e, 0x2b, 0x40, + 0xc3, 0x21, 0x4e, 0x2a, 0xa9, 0x58, 0xea, 0xb6, 0xee, 0x10, 0x95, 0x56, 0x64, 0xd1, 0x55, 0x79, + 0x92, 0xb7, 0x03, 0x34, 0x1c, 0xe2, 0xa4, 0x5d, 0xaf, 0x69, 0x47, 0xbb, 0xde, 0xfb, 0x1b, 0x38, + 0x63, 0xda, 0xe8, 0x65, 0x98, 0xd8, 0x55, 0x2c, 0x5d, 0x31, 0x9c, 0x72, 0x81, 0x31, 0xcc, 0x0a, + 0x86, 0x89, 0x07, 0x7c, 0x18, 0xbb, 0x74, 0xf9, 0xf7, 0x05, 0x11, 0x81, 0x5e, 0x57, 0x30, 0x86, + 0x4e, 0x79, 0x09, 0x72, 0x8e, 0x6f, 0x5b, 0x6f, 0xbf, 0x31, 0xb3, 0x32, 0x0a, 0xba, 0x0c, 0x13, + 0xaa, 0x69, 0x38, 0xc4, 0x70, 0x98, 0x31, 0x4b, 0xf5, 0x29, 0x3a, 0xfb, 0x3b, 0x7c, 0x08, 0xbb, + 0x34, 0xa4, 0x03, 0xa8, 0xa6, 0xd1, 0xd1, 0x1d, 0xdd, 0x34, 0xdc, 0x1c, 0x91, 0x24, 0x61, 0x7b, + 0x8b, 0xbd, 0xe3, 0x4a, 0xfb, 0x33, 0xf6, 0x86, 0x6c, 0x1c, 0x00, 0x47, 0x5f, 0x83, 0x69, 0x26, + 0xde, 0xec, 0x10, 0xc3, 0xd1, 0x9d, 0x3d, 0x61, 0xfa, 0x79, 0x21, 0xc6, 0x43, 0xcd, 0x25, 0xe2, + 0x30, 0x2f, 0xfa, 0x31, 0x94, 0x68, 0x1b, 0x47, 0x3a, 0x77, 0xba, 0x8a, 0xde, 0x73, 0x5b, 0xd2, + 0x3b, 0xa9, 0x3b, 0x44, 0x36, 0x71, 0x17, 0xe5, 0xae, 0xe1, 0x58, 0x81, 0xe2, 0x16, 0x24, 0xe1, + 0x90, 0x3a, 0xf4, 0x36, 0x4c, 0xa8, 0x16, 0xa1, 0x67, 0xbd, 0xf2, 0x04, 0x73, 0xe8, 0x97, 0x93, + 0x39, 0xb4, 0xad, 0xf7, 0x88, 0xb0, 0x3c, 0x17, 0xc7, 0x2e, 0x0e, 0x4d, 0x22, 0xba, 0x6d, 0x0f, + 0x48, 0xa7, 0xbe, 0x57, 0x2e, 0x26, 0xae, 0xcc, 0xde, 0x42, 0x9a, 0x54, 0xd6, 0xaa, 0x97, 0x68, + 0x12, 0x69, 0x0a, 0x1c, 0xec, 0x21, 0xa2, 0xef, 0xb9, 0xe8, 0x6d, 0x93, 0xf5, 0xa0, 0x53, 0x2b, + 0x5f, 0x49, 0x83, 0xbe, 0x31, 0x60, 0x51, 0x17, 0x84, 0x6f, 0x9b, 0xd8, 0x83, 0xac, 0xdc, 0x82, + 0xb9, 0x21, 0x43, 0xa2, 0xd3, 0x90, 0xdd, 0x21, 0xe2, 0x84, 0x8b, 0xe9, 0x4f, 0x74, 0x16, 0xf2, + 0xbb, 0x4a, 0x77, 0x20, 0xe2, 0x14, 0xf3, 0x3f, 0x37, 0x33, 0xab, 0x12, 0xcd, 0x2d, 0x53, 0xdc, + 0x33, 0x8e, 0x45, 0x94, 0xde, 0x18, 0xb6, 0x4c, 0x1b, 0x72, 0x76, 0x9f, 0xa8, 0xa2, 0xea, 0xae, + 0x24, 0x8e, 0x1c, 0x36, 0x3f, 0xda, 0xd8, 0xf9, 0xdb, 0x8c, 0xfe, 0xc3, 0x0c, 0x0d, 0x3d, 0xf2, + 0x5a, 0x04, 0xde, 0x5d, 0x5d, 0x4f, 0x89, 0x7b, 0x68, 0xab, 0x20, 0xff, 0x59, 0x82, 0xd3, 0x01, + 0xee, 0x71, 0x9d, 0xc3, 0x5b, 0xc7, 0xed, 0x50, 0xfc, 0x0a, 0x14, 0xe8, 0x52, 0xe4, 0x3f, 0xb8, + 0xcd, 0x95, 0xbb, 0x0a, 0xda, 0x62, 0x8d, 0x61, 0x19, 0x0f, 0x43, 0x1e, 0x5f, 0x4d, 0xe7, 0x19, + 0xbf, 0xa1, 0x8f, 0xf5, 0xfb, 0x66, 0xc4, 0xef, 0x37, 0x8f, 0x85, 0x7e, 0xb8, 0xf7, 0x7f, 0x96, + 0x81, 0xf9, 0xd8, 0x19, 0xd1, 0x3a, 0xcc, 0x7b, 0x6f, 0x66, 0xb9, 0xa2, 0x8f, 0xc0, 0x79, 0xb0, + 0xa0, 0x22, 0x0d, 0xc0, 0x22, 0x7d, 0xd3, 0xd6, 0x1d, 0xd3, 0xda, 0x13, 0x76, 0xf8, 0x6a, 0x82, + 0x99, 0x62, 0x4f, 0x28, 0x60, 0x86, 0x19, 0x6a, 0x68, 0x9f, 0x82, 0x03, 0xd0, 0xe8, 0x21, 0x9d, + 0x90, 0xa2, 0x11, 0x6a, 0x8e, 0x6c, 0x9a, 0xed, 0x15, 0xc4, 0xf7, 0x17, 0x41, 0x91, 0xb0, 0x40, + 0x94, 0x3f, 0xca, 0xc0, 0x0b, 0x23, 0x4c, 0x87, 0x70, 0xc8, 0x10, 0xb4, 0x0f, 0x4b, 0xe5, 0x06, + 0x7e, 0x00, 0x8c, 0x18, 0x4d, 0x8f, 0x31, 0xda, 0x8d, 0xe3, 0x18, 0x4d, 0x78, 0xf7, 0x10, 0xb3, + 0x3d, 0x8a, 0x98, 0xed, 0x7a, 0x4a, 0xb3, 0x45, 0xe2, 0x27, 0x62, 0xb8, 0x0f, 0x73, 0xa1, 0x7d, + 0x27, 0x6e, 0x5a, 0x4e, 0x7e, 0xdf, 0x75, 0x20, 0xbf, 0xd9, 0x35, 0x37, 0xdd, 0x06, 0xf6, 0x56, + 0x3a, 0x9f, 0xf0, 0x69, 0x56, 0xeb, 0x14, 0x81, 0x17, 0x68, 0x2f, 0xab, 0xb0, 0x31, 0xcc, 0xc1, + 0xd1, 0x76, 0xc4, 0x76, 0x6f, 0x1e, 0x4b, 0x0d, 0x37, 0x19, 0xd7, 0x33, 0xc2, 0x8e, 0x95, 0x1d, + 0x00, 0x7f, 0x36, 0x31, 0x55, 0xee, 0x5e, 0xb0, 0xca, 0xa5, 0xb8, 0xb6, 0xf2, 0x8e, 0x2c, 0x81, + 0xc2, 0x58, 0xf9, 0xa1, 0xa8, 0x8b, 0x23, 0xb5, 0xad, 0x85, 0xb5, 0xbd, 0x91, 0x38, 0x39, 0x87, + 0x2e, 0x5a, 0x82, 0xb5, 0xf8, 0x63, 0x49, 0x5c, 0x62, 0x08, 0xcb, 0x9c, 0xfc, 0x11, 0x67, 0x23, + 0x7c, 0xc4, 0x49, 0xbb, 0x6b, 0xe3, 0x0f, 0x3a, 0xff, 0x94, 0x00, 0x05, 0xb8, 0x5a, 0x4a, 0xbf, + 0xaf, 0x1b, 0xda, 0x17, 0xae, 0x5c, 0x1e, 0x71, 0xa8, 0x97, 0x7f, 0x93, 0x09, 0x79, 0x8b, 0xd5, + 0x03, 0x03, 0x4a, 0xdd, 0xc0, 0xf1, 0x2e, 0x6d, 0x2f, 0x12, 0x3c, 0x1a, 0xfa, 0xed, 0x70, 0x70, + 0x14, 0x87, 0xf0, 0xd1, 0x46, 0xe8, 0x1a, 0xd5, 0x4f, 0x6e, 0xe2, 0x58, 0xf8, 0x92, 0x80, 0x98, + 0x6f, 0xc4, 0x31, 0xe1, 0x78, 0x59, 0xf4, 0x36, 0xe4, 0x1c, 0x45, 0x73, 0x63, 0xa2, 0x96, 0xf2, + 0xd6, 0x28, 0x70, 0x08, 0x52, 0x34, 0x1b, 0x33, 0x28, 0xf9, 0xd7, 0xe1, 0xce, 0x43, 0x14, 0x8d, + 0x13, 0x99, 0x3d, 0x81, 0xf3, 0xfd, 0xc1, 0x66, 0x57, 0x57, 0x63, 0xa5, 0x84, 0x37, 0x2f, 0x09, + 0xe8, 0xf3, 0xeb, 0xa3, 0x59, 0xf1, 0x61, 0x38, 0xe8, 0x41, 0xc8, 0x48, 0x49, 0x3c, 0xfc, 0x96, + 0xd2, 0x23, 0x9d, 0xb6, 0xa2, 0xdd, 0xdd, 0x25, 0x86, 0x43, 0xf7, 0x62, 0xac, 0xa5, 0x3e, 0xc8, + 0xb9, 0xa7, 0x58, 0x66, 0xa9, 0xb6, 0x32, 0x8e, 0x8d, 0xf3, 0x4d, 0x1e, 0xe9, 0x7c, 0xdb, 0xa4, + 0x76, 0xf8, 0x44, 0xe8, 0xae, 0x6b, 0x05, 0x40, 0xbc, 0xc7, 0xe9, 0xa6, 0x21, 0xee, 0x0f, 0x3c, + 0xed, 0xf7, 0x3c, 0x0a, 0x0e, 0x70, 0x0d, 0x6d, 0x9b, 0xc2, 0x09, 0x6f, 0x9b, 0xed, 0x98, 0xc3, + 0xf6, 0xf5, 0x64, 0xcb, 0x66, 0xde, 0x4b, 0x7e, 0xd6, 0xf6, 0x52, 0x52, 0xfe, 0xb9, 0x74, 0xf0, + 0x7f, 0x0d, 0xa7, 0xd6, 0xb6, 0xa2, 0x8d, 0xa1, 0x48, 0x3c, 0x08, 0x17, 0x89, 0xe5, 0x74, 0x45, + 0xa2, 0xad, 0x68, 0x23, 0xea, 0xc4, 0xe7, 0x19, 0x28, 0x32, 0xc6, 0xf1, 0x04, 0x79, 0x2b, 0x74, + 0x0a, 0x49, 0x1d, 0xe5, 0xc5, 0xc8, 0xc1, 0xe3, 0x3b, 0xc7, 0x38, 0x70, 0x0e, 0xa7, 0x00, 0x38, + 0xec, 0x5e, 0x3a, 0xf7, 0xdf, 0xde, 0x4b, 0xcb, 0x7f, 0x92, 0xa0, 0xe4, 0x9a, 0x78, 0x0c, 0x91, + 0xb2, 0x1e, 0x8e, 0x94, 0x57, 0x92, 0xce, 0x7c, 0x74, 0x8c, 0xfc, 0x4b, 0x82, 0xb9, 0x21, 0xab, + 0xb9, 0x95, 0x59, 0x1a, 0x71, 0xdd, 0x7e, 0x8c, 0x69, 0xb8, 0xf0, 0xf1, 0xd3, 0x88, 0x24, 0x8c, + 0xec, 0xc9, 0x25, 0x0c, 0xf9, 0xfd, 0x2c, 0x9c, 0x8d, 0x3b, 0xf5, 0x3d, 0xaf, 0xd7, 0xac, 0xe8, + 0x5b, 0x54, 0x66, 0xdc, 0x6f, 0x51, 0xb9, 0xff, 0xd9, 0x5b, 0x54, 0x36, 0xe5, 0x5b, 0xd4, 0xfb, + 0x19, 0x38, 0x17, 0x7f, 0x96, 0x3c, 0xa1, 0x07, 0x29, 0xff, 0x14, 0x9a, 0x79, 0xfe, 0xa7, 0x50, + 0x74, 0x13, 0x66, 0x94, 0x0e, 0x0f, 0x33, 0xa5, 0x4b, 0x3b, 0x0e, 0x16, 0xc7, 0x93, 0x75, 0x74, + 0xb0, 0xbf, 0x38, 0x73, 0x3b, 0x44, 0xc1, 0x11, 0x4e, 0xf9, 0xb7, 0x12, 0xc0, 0x06, 0x51, 0x2d, + 0xe2, 0x8c, 0x21, 0x8b, 0xdc, 0x0a, 0x6f, 0xdf, 0x4a, 0x5c, 0xa8, 0xf3, 0xc9, 0x8c, 0x48, 0x1a, + 0x9f, 0x66, 0x01, 0x0d, 0xdf, 0x8b, 0xa3, 0x9b, 0xe2, 0xae, 0x9e, 0xa7, 0x8d, 0x2b, 0xc1, 0xbb, + 0xfa, 0x67, 0xfb, 0x8b, 0xe7, 0x86, 0x25, 0x02, 0xb7, 0xf8, 0x6b, 0x9e, 0xc3, 0xf9, 0x4d, 0xff, + 0xf5, 0xb0, 0x0b, 0x9f, 0xed, 0x2f, 0xc6, 0x7c, 0x37, 0x55, 0xf5, 0x90, 0x22, 0x8e, 0xd6, 0x60, + 0xba, 0xab, 0xd8, 0xce, 0xba, 0x65, 0x6e, 0x92, 0xb6, 0x2e, 0xbe, 0x18, 0x4a, 0x77, 0x97, 0xed, + 0xdd, 0xd6, 0xaf, 0x05, 0x81, 0x70, 0x18, 0x17, 0xed, 0x02, 0xa2, 0x03, 0x6d, 0x4b, 0x31, 0x6c, + 0xbe, 0x24, 0xaa, 0x2d, 0x97, 0x5a, 0x5b, 0x45, 0x68, 0x43, 0x6b, 0x43, 0x68, 0x38, 0x46, 0x03, + 0xba, 0x02, 0x05, 0x8b, 0x28, 0xb6, 0x69, 0x88, 0xb7, 0x05, 0x2f, 0x26, 0x31, 0x1b, 0xc5, 0x82, + 0x8a, 0x5e, 0x86, 0x89, 0x1e, 0xb1, 0x6d, 0x5a, 0xec, 0x22, 0xcf, 0x3b, 0x2d, 0x3e, 0x8c, 0x5d, + 0xba, 0xfc, 0x9e, 0x04, 0xbe, 0x8b, 0x58, 0x1f, 0xa9, 0xab, 0x77, 0xf9, 0x9b, 0xc4, 0x2a, 0x94, + 0x4c, 0x4b, 0x53, 0x0c, 0xfd, 0x31, 0x6f, 0x3a, 0xa5, 0xf0, 0xd3, 0xd3, 0xfd, 0x00, 0x0d, 0x87, + 0x38, 0x69, 0xb3, 0xaa, 0x9a, 0xbd, 0x9e, 0x69, 0xd0, 0x1a, 0x23, 0x5c, 0x1b, 0xc8, 0xd0, 0x2e, + 0x05, 0x07, 0xb8, 0xe4, 0x0f, 0x25, 0x98, 0x8d, 0xdc, 0xfe, 0xa3, 0x5f, 0x4a, 0x70, 0xce, 0x8e, + 0x9d, 0x9c, 0xd8, 0x1f, 0x37, 0xd2, 0x5c, 0xfa, 0x87, 0x00, 0xea, 0x0b, 0x62, 0x3e, 0x23, 0x56, + 0x8f, 0x47, 0x28, 0x96, 0xff, 0x2e, 0xc1, 0xe9, 0xe8, 0x3b, 0xc2, 0xff, 0xe3, 0x44, 0xd1, 0xeb, + 0x30, 0xc5, 0x4f, 0x5a, 0xdf, 0x22, 0x7b, 0xcd, 0x86, 0xf0, 0xc2, 0x19, 0x01, 0x36, 0xb5, 0xee, + 0x93, 0x70, 0x90, 0x4f, 0xfe, 0x79, 0x06, 0x8a, 0x6e, 0x7d, 0x45, 0xdf, 0xf6, 0xdf, 0x85, 0xa4, + 0xd4, 0xd1, 0xed, 0x05, 0xdd, 0xd0, 0xdb, 0xd0, 0xf3, 0xff, 0x10, 0xee, 0x92, 0xdb, 0xdc, 0xf1, + 0x83, 0x68, 0xfc, 0xcd, 0x43, 0xf8, 0x0c, 0x95, 0x4b, 0x72, 0x86, 0x92, 0x3f, 0xc8, 0xc2, 0xdc, + 0x50, 0xbb, 0x81, 0x6e, 0x84, 0x72, 0xde, 0xe5, 0x48, 0xce, 0x9b, 0x1f, 0x12, 0x38, 0xb1, 0x94, + 0x17, 0x9f, 0x89, 0xb2, 0x63, 0xcc, 0x44, 0xb9, 0xa4, 0x99, 0x28, 0x7f, 0x78, 0x26, 0x8a, 0x78, + 0xa7, 0x90, 0xc8, 0x3b, 0x1f, 0x49, 0x30, 0x1b, 0x69, 0xa0, 0xd0, 0x35, 0x28, 0xea, 0x86, 0x4d, + 0xd4, 0x81, 0x45, 0xc4, 0xf3, 0x81, 0x57, 0x15, 0x9b, 0x62, 0x1c, 0x7b, 0x1c, 0xa8, 0x06, 0x93, + 0xb6, 0xba, 0x4d, 0x3a, 0x83, 0x2e, 0xe9, 0x30, 0x8f, 0x14, 0xfd, 0xa7, 0xfc, 0x0d, 0x97, 0x80, + 0x7d, 0x1e, 0xd4, 0x00, 0xe0, 0xbd, 0x58, 0xcb, 0xec, 0xb8, 0xe1, 0xe6, 0x7e, 0xff, 0x06, 0x4d, + 0x8f, 0xf2, 0x6c, 0x7f, 0x71, 0xc6, 0xff, 0xc7, 0xfc, 0x1f, 0x90, 0x93, 0xff, 0x9d, 0x83, 0x52, + 0xb0, 0x11, 0x4b, 0xf0, 0x85, 0xc9, 0x3b, 0x30, 0xa5, 0x18, 0x86, 0xe9, 0x28, 0xbc, 0x5b, 0xce, + 0x24, 0xbe, 0x15, 0x0e, 0xea, 0xa9, 0xde, 0xf6, 0x21, 0xf8, 0xad, 0xb0, 0x97, 0x11, 0x02, 0x14, + 0x1c, 0xd4, 0x84, 0x6e, 0x8b, 0x16, 0x39, 0x9b, 0xbc, 0x45, 0x2e, 0x46, 0xda, 0xe3, 0x1a, 0x4c, + 0x7a, 0x9d, 0xa4, 0xf8, 0x78, 0xc9, 0xb3, 0xb2, 0xbf, 0xb5, 0x7d, 0x1e, 0x54, 0x0d, 0x05, 0x43, + 0x9e, 0x05, 0xc3, 0xcc, 0x21, 0x57, 0x1d, 0xd1, 0xfe, 0xbb, 0x30, 0xee, 0xfe, 0x7b, 0x62, 0x2c, + 0xfd, 0x77, 0xe5, 0xeb, 0x70, 0x3a, 0xea, 0xc1, 0x54, 0xef, 0xd2, 0xeb, 0x80, 0x86, 0xf5, 0x1f, + 0xd5, 0xc2, 0x0d, 0x4b, 0xf8, 0xf9, 0xac, 0x7e, 0xef, 0xc9, 0xd3, 0x85, 0x53, 0x9f, 0x3c, 0x5d, + 0x38, 0xf5, 0xd9, 0xd3, 0x85, 0x53, 0x3f, 0x39, 0x58, 0x90, 0x9e, 0x1c, 0x2c, 0x48, 0x9f, 0x1c, + 0x2c, 0x48, 0x9f, 0x1d, 0x2c, 0x48, 0x9f, 0x1f, 0x2c, 0x48, 0xbf, 0xf8, 0xc7, 0xc2, 0xa9, 0x87, + 0x17, 0x8f, 0xfc, 0x06, 0xff, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xa8, 0x38, 0xe0, 0xa7, + 0x2f, 0x00, 0x00, } func (m *DockerImageReference) Marshal() (dAtA []byte, err error) { @@ -1503,6 +1504,15 @@ func (m *ImageBlobReferences) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Manifests) > 0 { + for iNdEx := len(m.Manifests) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Manifests[iNdEx]) + copy(dAtA[i:], m.Manifests[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Manifests[iNdEx]))) + i-- + dAtA[i] = 0x22 + } + } i-- if m.ImageMissing { dAtA[i] = 1 @@ -3538,6 +3548,12 @@ func (m *ImageBlobReferences) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } n += 2 + if len(m.Manifests) > 0 { + for _, s := range m.Manifests { + l = len(s) + n += 1 + l + sovGenerated(uint64(l)) + } + } return n } @@ -4263,6 +4279,7 @@ func (this *ImageBlobReferences) String() string { `Layers:` + fmt.Sprintf("%v", this.Layers) + `,`, `Config:` + valueToStringGenerated(this.Config) + `,`, `ImageMissing:` + fmt.Sprintf("%v", this.ImageMissing) + `,`, + `Manifests:` + fmt.Sprintf("%v", this.Manifests) + `,`, `}`, }, "") return s @@ -5557,6 +5574,38 @@ func (m *ImageBlobReferences) Unmarshal(dAtA []byte) error { } } m.ImageMissing = bool(v != 0) + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Manifests", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Manifests = append(m.Manifests, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/vendor/github.com/openshift/api/image/v1/generated.proto b/vendor/github.com/openshift/api/image/v1/generated.proto index faef1f7b1c..11f6ea5d47 100644 --- a/vendor/github.com/openshift/api/image/v1/generated.proto +++ b/vendor/github.com/openshift/api/image/v1/generated.proto @@ -101,6 +101,13 @@ message ImageBlobReferences { // not have separate config blobs and this field will be set to nil if so. // +optional optional string config = 2; + + // manifests is the list of other image names that this image points + // to. For a single architecture image, it is empty. For a multi-arch + // image, it consists of the digests of single architecture images, + // such images shouldn't have layers nor config. + // +optional + repeated string manifests = 4; } // ImageImportSpec describes a request to import a specific image. diff --git a/vendor/github.com/openshift/api/image/v1/types.go b/vendor/github.com/openshift/api/image/v1/types.go index 3edf9f0aef..b459eb378e 100644 --- a/vendor/github.com/openshift/api/image/v1/types.go +++ b/vendor/github.com/openshift/api/image/v1/types.go @@ -605,6 +605,12 @@ type ImageBlobReferences struct { // not have separate config blobs and this field will be set to nil if so. // +optional Config *string `json:"config" protobuf:"bytes,2,opt,name=config"` + // manifests is the list of other image names that this image points + // to. For a single architecture image, it is empty. For a multi-arch + // image, it consists of the digests of single architecture images, + // such images shouldn't have layers nor config. + // +optional + Manifests []string `json:"manifests,omitempty" protobuf:"bytes,4,rep,name=manifests"` } // ImageLayerData contains metadata about an image layer. diff --git a/vendor/github.com/openshift/api/image/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/image/v1/zz_generated.deepcopy.go index a8894b039c..953f70263c 100644 --- a/vendor/github.com/openshift/api/image/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/image/v1/zz_generated.deepcopy.go @@ -94,6 +94,11 @@ func (in *ImageBlobReferences) DeepCopyInto(out *ImageBlobReferences) { *out = new(string) **out = **in } + if in.Manifests != nil { + in, out := &in.Manifests, &out.Manifests + *out = make([]string, len(*in)) + copy(*out, *in) + } return } diff --git a/vendor/github.com/openshift/api/image/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/image/v1/zz_generated.swagger_doc_generated.go index 561e44c570..d7133cd021 100644 --- a/vendor/github.com/openshift/api/image/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/image/v1/zz_generated.swagger_doc_generated.go @@ -47,6 +47,7 @@ var map_ImageBlobReferences = map[string]string{ "imageMissing": "imageMissing is true if the image is referenced by the image stream but the image object has been deleted from the API by an administrator. When this field is set, layers and config fields may be empty and callers that depend on the image metadata should consider the image to be unavailable for download or viewing.", "layers": "layers is the list of blobs that compose this image, from base layer to top layer. All layers referenced by this array will be defined in the blobs map. Some images may have zero layers.", "config": "config, if set, is the blob that contains the image config. Some images do not have separate config blobs and this field will be set to nil if so.", + "manifests": "manifests is the list of other image names that this image points to. For a single architecture image, it is empty. For a multi-arch image, it consists of the digests of single architecture images, such images shouldn't have layers nor config.", } func (ImageBlobReferences) SwaggerDoc() map[string]string { diff --git a/vendor/modules.txt b/vendor/modules.txt index 303a7639fd..49bfc8e33f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -109,7 +109,7 @@ github.com/munnerz/goautoneg # github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f ## explicit github.com/mwitkow/go-conntrack -# github.com/openshift/api v0.0.0-20221207195358-a671aa80d995 +# github.com/openshift/api v0.0.0-20230106230226-5ad311dde226 ## explicit; go 1.18 github.com/openshift/api/config/v1 github.com/openshift/api/config/v1alpha1