Skip to content

OCPBUGS-74510: Removed VSphereMultiDisk feature gate #1532

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
vr4manta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-74510: Removed VSphereMultiDisk feature gate #1532

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/machineset/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func main() {

// Sets up feature gates
defaultMutableGate := feature.DefaultMutableFeatureGate
gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, majorVersion, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration, apifeatures.FeatureGateVSphereHostVMGroupZonal, apifeatures.FeatureGateVSphereMultiDisk)
gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, majorVersion, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration, apifeatures.FeatureGateVSphereHostVMGroupZonal)
if err != nil {
klog.Fatalf("Error setting up feature gates: %v", err)
}
Expand Down
5 changes: 1 addition & 4 deletions cmd/vsphere/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func main() {

// Sets up feature gates
defaultMutableGate := feature.DefaultMutableFeatureGate
gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, majorVersion, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration, apifeatures.FeatureGateVSphereHostVMGroupZonal, apifeatures.FeatureGateVSphereMultiDisk)
gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, majorVersion, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration, apifeatures.FeatureGateVSphereHostVMGroupZonal)
if err != nil {
klog.Fatalf("Error setting up feature gates: %v", err)
}
Expand Down Expand Up @@ -167,9 +167,6 @@ func main() {

hostVMGroupZonalFeatureGateEnabled := defaultMutableGate.Enabled(featuregate.Feature(apifeatures.FeatureGateVSphereHostVMGroupZonal))
klog.Infof("FeatureGateVSphereHostVMGroupZonal initialised %t", hostVMGroupZonalFeatureGateEnabled)
multiDiskFeatureGateEnabled := defaultMutableGate.Enabled(featuregate.Feature(apifeatures.FeatureGateVSphereMultiDisk))
klog.Infof("FeatureGateVSphereMultiDisk initialised: %t", multiDiskFeatureGateEnabled)

// Setup a Manager
mgr, err := manager.New(cfg, opts)
if err != nil {
Expand Down
6 changes: 0 additions & 6 deletions pkg/controller/vsphere/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,12 +1203,6 @@ func getDiskSpec(s *machineScope, devices object.VirtualDeviceList) (types.BaseV
func createDataDisks(s *machineScope, devices object.VirtualDeviceList) ([]types.BaseVirtualDeviceConfigSpec, error) {
var diskSpecs []types.BaseVirtualDeviceConfigSpec

// Only add additional disks if the feature gate is enabled.
if len(s.providerSpec.DataDisks) > 0 && !s.featureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateVSphereMultiDisk)) {
return nil, machinecontroller.InvalidMachineConfiguration(
"machines cannot contain additional disks due to VSphereMultiDisk feature gate being disabled")
}

// Get primary disk
disks := devices.SelectByType((*types.VirtualDisk)(nil))
if len(disks) == 0 {
Expand Down
1 change: 0 additions & 1 deletion pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ func (optr *Operator) maoConfigFromInfrastructure() (*OperatorConfig, error) {
string(apifeatures.FeatureGateAWSDedicatedHosts): featureGates.Enabled(apifeatures.FeatureGateAWSDedicatedHosts),
string(apifeatures.FeatureGateMachineAPIMigration): featureGates.Enabled(apifeatures.FeatureGateMachineAPIMigration),
string(apifeatures.FeatureGateAzureWorkloadIdentity): featureGates.Enabled(apifeatures.FeatureGateAzureWorkloadIdentity),
string(apifeatures.FeatureGateVSphereMultiDisk): featureGates.Enabled(apifeatures.FeatureGateVSphereMultiDisk),
string(apifeatures.FeatureGateVSphereHostVMGroupZonal): featureGates.Enabled(apifeatures.FeatureGateVSphereHostVMGroupZonal),
}
if features[string(apifeatures.FeatureGateMachineAPIMigration)] {
Expand Down
2 changes: 0 additions & 2 deletions pkg/operator/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ var (
enabledFeatureGates = []openshiftv1.FeatureGateAttributes{
{Name: apifeatures.FeatureGateMachineAPIMigration},
{Name: apifeatures.FeatureGateAzureWorkloadIdentity},
{Name: apifeatures.FeatureGateVSphereMultiDisk},
{Name: apifeatures.FeatureGateVSphereHostVMGroupZonal},
{Name: apifeatures.FeatureGateAWSDedicatedHosts},
}
Expand All @@ -56,7 +55,6 @@ var (
enabledFeatureMap = map[string]bool{
"MachineAPIMigration": true,
"AzureWorkloadIdentity": true,
"VSphereMultiDisk": true,
"VSphereHostVMGroupZonal": true,
"AWSDedicatedHosts": true,
}
Expand Down
4 changes: 1 addition & 3 deletions pkg/util/testing/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,13 @@ func NewDefaultMutableFeatureGate() (featuregate.MutableFeatureGate, error) {
_, err := features.NewFeatureGateOptions(defaultMutableGate, version.Version.Major,
openshiftfeatures.SelfManaged,
openshiftfeatures.FeatureGateMachineAPIMigration,
openshiftfeatures.FeatureGateVSphereHostVMGroupZonal,
openshiftfeatures.FeatureGateVSphereMultiDisk)
openshiftfeatures.FeatureGateVSphereHostVMGroupZonal)
if err != nil {
return nil, fmt.Errorf("failed to set up default feature gate: %w", err)
}
if err := defaultMutableGate.SetFromMap(
map[string]bool{
"MachineAPIMigration": true,
"VSphereMultiDisk": true,
},
); err != nil {
return nil, fmt.Errorf("failed to set features from map: %w", err)
Expand Down
6 changes: 1 addition & 5 deletions pkg/webhooks/machine_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,11 +1763,7 @@ func validateVSphere(m *machinev1beta1.Machine, config *admissionConfig) (bool,
}

if len(providerSpec.DataDisks) > 0 {
if !config.featureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateVSphereMultiDisk)) {
errs = append(errs, field.Forbidden(field.NewPath("providerSpec", "disks"), "this field is protected by the VSphereMultiDisk feature gate which must be enabled through either the TechPreviewNoUpgrade or CustomNoUpgrade feature set"))
} else {
errs = append(errs, validateVSphereDataDisks(providerSpec.DataDisks)...)
}
errs = append(errs, validateVSphereDataDisks(providerSpec.DataDisks)...)
}

if len(errs) > 0 {
Expand Down
60 changes: 1 addition & 59 deletions pkg/webhooks/machine_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5553,25 +5553,7 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}(),
},
{
testCase: "with data disk configured without feature gate enabled",
modifySpec: func(p *machinev1beta1.VSphereMachineProviderSpec) {
p.DataDisks = []machinev1beta1.VSphereDisk{
{
Name: "Disk1",
SizeGiB: 10,
},
}
},
expectedOk: false,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = false
return fg
}(),
expectedError: "providerSpec.disks: Forbidden: this field is protected by the VSphereMultiDisk feature gate which must be enabled through either the TechPreviewNoUpgrade or CustomNoUpgrade feature set",
},
{
testCase: "with data disk configured with feature gate enabled",
testCase: "with data disk configured",
modifySpec: func(p *machinev1beta1.VSphereMachineProviderSpec) {
p.DataDisks = []machinev1beta1.VSphereDisk{
{
Expand All @@ -5581,11 +5563,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: true,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
},
{
testCase: "with data disk configured with max size",
Expand All @@ -5598,11 +5575,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: true,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
},
{
testCase: "with data disk configured with size above max",
Expand All @@ -5615,11 +5587,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: false,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
expectedError: "providerSpec.disks[0].sizeGiB: Invalid value: 17000: data disk size (GiB) must not exceed 16384",
},
{
Expand All @@ -5632,11 +5599,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: false,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
expectedError: "providerSpec.disks[0].sizeGiB: Required value: data disk size must be set",
},
{
Expand All @@ -5649,11 +5611,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: false,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
expectedError: "providerSpec.disks[0].name: Required value: data disk name must be set",
},
{
Expand All @@ -5667,11 +5624,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: false,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
expectedError: "providerSpec.disks[0].name: Invalid value: \"Bad #Name\": data disk name must consist only of alphanumeric characters, hyphens and underscores, and must start and end with an alphanumeric character.",
},
{
Expand All @@ -5686,11 +5638,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: true,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
},
{
testCase: "with data disk configured with invalid provisioning mode",
Expand All @@ -5704,11 +5651,6 @@ func TestValidateVSphereProviderSpec(t *testing.T) {
}
},
expectedOk: false,
featureGatesEnabled: func() map[string]bool {
fg := make(map[string]bool)
fg[string(features.FeatureGateVSphereMultiDisk)] = true
return fg
}(),
expectedError: "providerSpec.disks[0]: Unsupported value: \"Fat\": supported values: \"EagerlyZeroed\", \"Thick\", \"Thin\"",
},
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/vsphere/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const (
machineReadyTimeout = time.Minute * 6
)

var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiDisk][platform:vsphere][Disruptive] Managed cluster should", Label("Conformance"), Label("Serial"), func() {
var _ = Describe("[sig-cluster-lifecycle][platform:vsphere][Disruptive] Managed cluster should", Label("Conformance"), Label("Serial"), func() {
defer GinkgoRecover()
ctx := context.Background()

Expand Down