Add downwardmetrics feature gate

Signed-off-by: Roman Mohr <rmohr@redhat.com>
kubevirt · May 14, 2021 · 31e347b · 31e347b
1 parent f57bffc
commit 31e347b
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 11 deletions.
diff --git a/pkg/virt-api/webhooks/validating-webhook/admitters/vmi-create-admitter.go b/pkg/virt-api/webhooks/validating-webhook/admitters/vmi-create-admitter.go
@@ -1906,6 +1906,14 @@ func validateVolumes(field *k8sfield.Path, volumes []v1.Volume, config *virtconf
 			}
 		}
 
+		if volume.DownwardMetrics != nil && !config.DownwardMetricsEnabled() {
+			causes = append(causes, metav1.StatusCause{
+				Type:    metav1.CauseTypeFieldValueInvalid,
+				Message: "downwardMetrics disks are not allowed: DownwardMetrics feature gate is not enabled.",
+				Field:   field.Index(idx).String(),
+			})
+		}
+
 		// validate HostDisk data
 		if hostDisk := volume.HostDisk; hostDisk != nil {
 			if !config.HostDiskEnabled() {

diff --git a/pkg/virt-api/webhooks/validating-webhook/admitters/vmi-create-admitter_test.go b/pkg/virt-api/webhooks/validating-webhook/admitters/vmi-create-admitter_test.go
@@ -3038,6 +3038,56 @@ var _ = Describe("Validating VMICreate Admitter", func() {
 	})
 
 	Context("with volume", func() {
+		It("should accept a single downwardmetrics volume", func() {
+			enableFeatureGate(virtconfig.DownwardMetricsFeatureGate)
+			vmi := v1.NewMinimalVMI("testvmi")
+
+			vmi.Spec.Volumes = append(vmi.Spec.Volumes, v1.Volume{
+				Name: "testDownwardMetrics",
+				VolumeSource: v1.VolumeSource{
+					DownwardMetrics: &v1.DownwardMetricsVolumeSource{},
+				},
+			})
+
+			causes := validateVolumes(k8sfield.NewPath("fake"), vmi.Spec.Volumes, config)
+			Expect(causes).To(BeEmpty())
+		})
+		It("should reject downwardMetrics volumes if the feature gate is not enabled", func() {
+			vmi := v1.NewMinimalVMI("testvmi")
+
+			vmi.Spec.Volumes = append(vmi.Spec.Volumes, v1.Volume{
+				Name: "testDownwardMetrics",
+				VolumeSource: v1.VolumeSource{
+					DownwardMetrics: &v1.DownwardMetricsVolumeSource{},
+				},
+			})
+
+			causes := validateVolumes(k8sfield.NewPath("fake"), vmi.Spec.Volumes, config)
+			Expect(causes).To(HaveLen(1))
+			Expect(causes[0].Message).To(ContainSubstring("downwardMetrics disks are not allowed: DownwardMetrics feature gate is not enabled."))
+		})
+		It("should reject downwardMetrics volumes if more than one exist", func() {
+			enableFeatureGate(virtconfig.DownwardMetricsFeatureGate)
+			vmi := v1.NewMinimalVMI("testvmi")
+
+			vmi.Spec.Volumes = append(vmi.Spec.Volumes,
+				v1.Volume{
+					Name: "testDownwardMetrics",
+					VolumeSource: v1.VolumeSource{
+						DownwardMetrics: &v1.DownwardMetricsVolumeSource{},
+					},
+				},
+				v1.Volume{
+					Name: "testDownwardMetrics1",
+					VolumeSource: v1.VolumeSource{
+						DownwardMetrics: &v1.DownwardMetricsVolumeSource{},
+					},
+				},
+			)
+			causes := validateVolumes(k8sfield.NewPath("fake"), vmi.Spec.Volumes, config)
+			Expect(causes).To(HaveLen(1))
+			Expect(causes[0].Message).To(ContainSubstring("fake must have max one downwardMetric volume set"))
+		})
 		It("should reject hostDisk volumes if the feature gate is not enabled", func() {
 			vmi := v1.NewMinimalVMI("testvmi")
 

diff --git a/pkg/virt-config/feature-gates.go b/pkg/virt-config/feature-gates.go
@@ -28,17 +28,18 @@ const (
 	IgnitionGate      = "ExperimentalIgnitionSupport"
 	LiveMigrationGate = "LiveMigration"
 	// SRIOVLiveMigrationGate enable's Live Migration for VM's with SRIOV interfaces.
-	SRIOVLiveMigrationGate = "SRIOVLiveMigration"
-	CPUNodeDiscoveryGate   = "CPUNodeDiscovery"
-	HypervStrictCheckGate  = "HypervStrictCheck"
-	SidecarGate            = "Sidecar"
-	GPUGate                = "GPU"
-	HostDevicesGate        = "HostDevices"
-	SnapshotGate           = "Snapshot"
-	HotplugVolumesGate     = "HotplugVolumes"
-	HostDiskGate           = "HostDisk"
-	VirtIOFSGate           = "ExperimentalVirtiofsSupport"
-	MacvtapGate            = "Macvtap"
+	SRIOVLiveMigrationGate     = "SRIOVLiveMigration"
+	CPUNodeDiscoveryGate       = "CPUNodeDiscovery"
+	HypervStrictCheckGate      = "HypervStrictCheck"
+	SidecarGate                = "Sidecar"
+	GPUGate                    = "GPU"
+	HostDevicesGate            = "HostDevices"
+	SnapshotGate               = "Snapshot"
+	HotplugVolumesGate         = "HotplugVolumes"
+	HostDiskGate               = "HostDisk"
+	VirtIOFSGate               = "ExperimentalVirtiofsSupport"
+	MacvtapGate                = "Macvtap"
+	DownwardMetricsFeatureGate = "DownwardMetrics"
 )
 
 func (c *ClusterConfig) isFeatureGateEnabled(featureGate string) bool {
@@ -54,6 +55,10 @@ func (config *ClusterConfig) CPUManagerEnabled() bool {
 	return config.isFeatureGateEnabled(CPUManager)
 }
 
+func (config *ClusterConfig) DownwardMetricsEnabled() bool {
+	return config.isFeatureGateEnabled(DownwardMetricsFeatureGate)
+}
+
 func (config *ClusterConfig) IgnitionEnabled() bool {
 	return config.isFeatureGateEnabled(IgnitionGate)
 }

diff --git a/tests/utils.go b/tests/utils.go
@@ -774,6 +774,7 @@ func AdjustKubeVirtResource() {
 		virtconfig.HostDiskGate,
 		virtconfig.VirtIOFSGate,
 		virtconfig.HotplugVolumesGate,
+		virtconfig.DownwardMetricsFeatureGate,
 	)
 	kv.Spec.Configuration.SELinuxLauncherType = "virt_launcher.process"