Skip to content

Remove VideoConfig feature gate #4294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dasionov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove VideoConfig feature gate #4294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions api/v1/featuregates/feature_gates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,6 @@ var _ = Describe("Feature Gates", func() {
Entry("known alpha FG; in list; disabled", featuregates.HyperConvergedFeatureGates{{Name: "downwardMetrics", State: ptr.To(featuregates.Disabled)}}, "downwardMetrics", BeFalse()),
Entry("known alpha FG; not in list; disabled", featuregates.HyperConvergedFeatureGates{{Name: "deployKubeSecondaryDNS", State: ptr.To(featuregates.Enabled)}}, "downwardMetrics", BeFalse()),

Entry("known beta FG; in list; enabled", featuregates.HyperConvergedFeatureGates{{Name: "videoConfig", State: ptr.To(featuregates.Enabled)}}, "videoConfig", BeTrue()),
Entry("known beta FG; in list; disabled", featuregates.HyperConvergedFeatureGates{{Name: "videoConfig", State: ptr.To(featuregates.Disabled)}}, "videoConfig", BeFalse()),
Entry("known beta FG; not in list; disabled", featuregates.HyperConvergedFeatureGates{{Name: "deployKubeSecondaryDNS", State: ptr.To(featuregates.Enabled)}}, "videoConfig", BeTrue()),

Entry("known deprecated FG; in list; enabled", featuregates.HyperConvergedFeatureGates{{Name: "withHostPassthroughCPU", State: ptr.To(featuregates.Enabled)}}, "withHostPassthroughCPU", BeFalse()),
Entry("known deprecated FG; in list; disabled", featuregates.HyperConvergedFeatureGates{{Name: "withHostPassthroughCPU", State: ptr.To(featuregates.Disabled)}}, "withHostPassthroughCPU", BeFalse()),
Entry("known deprecated FG; not in list; disabled", featuregates.HyperConvergedFeatureGates{{Name: "deployKubeSecondaryDNS", State: ptr.To(featuregates.Enabled)}}, "withHostPassthroughCPU", BeFalse()),
Expand Down
6 changes: 0 additions & 6 deletions api/v1/hyperconverged_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ type HyperConvergedSpec struct {
// Developer Preview.
// Phase: beta
//
// * videoConfig:
// VideoConfig allows users to configure video device types for their virtual
// machines. This can be useful for workloads that require specific video
// capabilities or architectures. Note: This feature is in Tech Preview.
// Phase: beta
//
// * alignCPUs:
// Enable KubeVirt to request up to two additional dedicated CPUs in order to
// complete the total CPU count to an even parity when using emulator thread
Expand Down
2 changes: 1 addition & 1 deletion api/v1/zz_generated.openapi.go
View file
Open in desktop

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

6 changes: 1 addition & 5 deletions api/v1beta1/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,14 +403,13 @@ var _ = Describe("api/v1beta1", func() {
DownwardMetrics: ptr.To(true),
AlignCPUs: ptr.To(true),
DecentralizedLiveMigration: ptr.To(false),
VideoConfig: ptr.To(false),
ObjectGraph: ptr.To(false), // alpha default, should not appear
}
out := &hcofg.HyperConvergedFeatureGates{}

convert_v1beta1_FeatureGates_To_v1(in, out)

Expect(*out).To(HaveLen(4))
Expect(*out).To(HaveLen(3))
})
})

Expand Down Expand Up @@ -490,7 +489,6 @@ var _ = Describe("api/v1beta1", func() {
It("should preserve beta feature gate disabled through round-trip", func() {
original := &HyperConvergedFeatureGates{
DecentralizedLiveMigration: ptr.To(false),
VideoConfig: ptr.To(false),
}

v1fgs := &hcofg.HyperConvergedFeatureGates{}
Expand All @@ -500,7 +498,6 @@ var _ = Describe("api/v1beta1", func() {
convert_v1_FeatureGates_To_v1beta1(*v1fgs, result)

Expect(*result.DecentralizedLiveMigration).To(BeFalse())
Expect(*result.VideoConfig).To(BeFalse())
})

It("should preserve defaults through round-trip", func() {
Expand All @@ -517,7 +514,6 @@ var _ = Describe("api/v1beta1", func() {
Expect(*result.AlignCPUs).To(BeFalse())
// beta defaults stay true
Expect(*result.DecentralizedLiveMigration).To(BeTrue())
Expect(*result.VideoConfig).To(BeTrue())
})
})
})
Expand Down
12 changes: 4 additions & 8 deletions api/v1beta1/hyperconverged_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ type HyperConvergedSpec struct {

// featureGates is a map of feature gate flags. Setting a flag to `true` will enable
// the feature. Setting `false` or removing the feature gate, disables the feature.
// +kubebuilder:default={"downwardMetrics": false, "deployKubeSecondaryDNS": false, "persistentReservation": false, "enableMultiArchBootImageImport": false, "decentralizedLiveMigration": true, "declarativeHotplugVolumes": false, "videoConfig": true, "objectGraph": false, "incrementalBackup": false, "containerPathVolumes": false}
// +kubebuilder:default={"downwardMetrics": false, "deployKubeSecondaryDNS": false, "persistentReservation": false, "enableMultiArchBootImageImport": false, "decentralizedLiveMigration": true, "declarativeHotplugVolumes": false, "objectGraph": false, "incrementalBackup": false, "containerPathVolumes": false}
// +optional
// +k8s:conversion-gen=false
FeatureGates HyperConvergedFeatureGates `json:"featureGates,omitempty"`
Expand Down Expand Up @@ -485,12 +485,8 @@ type HyperConvergedFeatureGates struct {
// +default=false
DeclarativeHotplugVolumes *bool `json:"declarativeHotplugVolumes,omitempty"`

// VideoConfig allows users to configure video device types for their virtual machines.
// This can be useful for workloads that require specific video capabilities or architectures.
// Note: This feature is in Tech Preview.
// +optional
// +kubebuilder:default=true
// +default=true
// Deprecated: This feature gate is ignored.
// +hco:fgphase:discontinued
VideoConfig *bool `json:"videoConfig,omitempty"`

// ObjectGraph enables the ObjectGraph VM and VMI subresource in KubeVirt.
Expand Down Expand Up @@ -634,7 +630,7 @@ type HyperConverged struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

// +kubebuilder:default={"certConfig": {"ca": {"duration": "48h0m0s", "renewBefore": "24h0m0s"}, "server": {"duration": "24h0m0s", "renewBefore": "12h0m0s"}},"featureGates": {"downwardMetrics": false, "deployKubeSecondaryDNS": false, "persistentReservation": false, "enableMultiArchBootImageImport": false, "decentralizedLiveMigration": true, "declarativeHotplugVolumes": false, "videoConfig": true, "objectGraph": false, "incrementalBackup": false, "containerPathVolumes": false}, "liveMigrationConfig": {"completionTimeoutPerGiB": 150, "parallelMigrationsPerCluster": 5, "parallelOutboundMigrationsPerNode": 2, "progressTimeout": 150, "allowAutoConverge": false, "allowPostCopy": false}, "resourceRequirements": {"vmiCPUAllocationRatio": 10}, "uninstallStrategy": "BlockUninstallIfWorkloadsExist", "virtualMachineOptions": {"disableFreePageReporting": false, "disableSerialConsoleLog": false}, "enableApplicationAwareQuota": false, "enableCommonBootImageImport": true, "deployVmConsoleProxy": false}
// +kubebuilder:default={"certConfig": {"ca": {"duration": "48h0m0s", "renewBefore": "24h0m0s"}, "server": {"duration": "24h0m0s", "renewBefore": "12h0m0s"}},"featureGates": {"downwardMetrics": false, "deployKubeSecondaryDNS": false, "persistentReservation": false, "enableMultiArchBootImageImport": false, "decentralizedLiveMigration": true, "declarativeHotplugVolumes": false, "objectGraph": false, "incrementalBackup": false, "containerPathVolumes": false}, "liveMigrationConfig": {"completionTimeoutPerGiB": 150, "parallelMigrationsPerCluster": 5, "parallelOutboundMigrationsPerNode": 2, "progressTimeout": 150, "allowAutoConverge": false, "allowPostCopy": false}, "resourceRequirements": {"vmiCPUAllocationRatio": 10}, "uninstallStrategy": "BlockUninstallIfWorkloadsExist", "virtualMachineOptions": {"disableFreePageReporting": false, "disableSerialConsoleLog": false}, "enableApplicationAwareQuota": false, "enableCommonBootImageImport": true, "deployVmConsoleProxy": false}
// +optional
Spec HyperConvergedSpec `json:"spec,omitempty"`
Status hcov1.HyperConvergedStatus `json:"status,omitempty"`
Expand Down
4 changes: 0 additions & 4 deletions api/v1beta1/zz_generated.defaults.go
View file
Open in desktop

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

5 changes: 0 additions & 5 deletions api/v1beta1/zz_generated.featuregates_conversion.go
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions api/v1beta1/zz_generated.openapi.go
View file
Open in desktop

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

14 changes: 1 addition & 13 deletions config/crd/bases/hco.kubevirt.io_hyperconvergeds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2232,12 +2232,6 @@ spec:
Developer Preview.
Phase: beta

* videoConfig:
VideoConfig allows users to configure video device types for their virtual
machines. This can be useful for workloads that require specific video
capabilities or architectures. Note: This feature is in Tech Preview.
Phase: beta

* alignCPUs:
Enable KubeVirt to request up to two additional dedicated CPUs in order to
complete the total CPU count to an even parity when using emulator thread
Expand Down Expand Up @@ -5396,7 +5390,6 @@ spec:
incrementalBackup: false
objectGraph: false
persistentReservation: false
videoConfig: true
liveMigrationConfig:
allowAutoConverge: false
allowPostCopy: false
Expand Down Expand Up @@ -6535,7 +6528,6 @@ spec:
incrementalBackup: false
objectGraph: false
persistentReservation: false
videoConfig: true
description: |-
featureGates is a map of feature gate flags. Setting a flag to `true` will enable
the feature. Setting `false` or removing the feature gate, disables the feature.
Expand Down Expand Up @@ -6645,11 +6637,7 @@ spec:
description: 'Deprecated: this feature gate is ignored.'
type: boolean
videoConfig:
default: true
description: |-
VideoConfig allows users to configure video device types for their virtual machines.
This can be useful for workloads that require specific video capabilities or architectures.
Note: This feature is in Tech Preview.
description: 'Deprecated: This feature gate is ignored.'
type: boolean
withHostPassthroughCPU:
description: 'Deprecated: This feature gate is ignored'
Expand Down
5 changes: 0 additions & 5 deletions controllers/handlers/kubevirt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ const (
kvPersistentReservation = "PersistentReservation"
kvAlignCPUs = "AlignCPUs"
kvDecentralizedLiveMigration = "DecentralizedLiveMigration"
kvVideoConfig = "VideoConfig"
kvObjectGraph = "ObjectGraph"
kvUtilityVolumes = "UtilityVolumes"
kvIncrementalBackup = "IncrementalBackup"
Expand Down Expand Up @@ -925,10 +924,6 @@ func getFeatureGateChecks(hc *hcov1.HyperConverged) []string {
if featureGates.IsEnabled("alignCPUs") {
fgs = append(fgs, kvAlignCPUs)
}
if featureGates.IsEnabled("videoConfig") {
fgs = append(fgs, kvVideoConfig)
}

if featureGates.IsEnabled("objectGraph") {
fgs = append(fgs, kvObjectGraph)
}
Expand Down
Loading