From 68b11acab339ac83f075715bf94b02c3f87a5a3e Mon Sep 17 00:00:00 2001 From: Helene Durand <90329641+hdurand0710@users.noreply.github.com> Date: Wed, 23 Nov 2022 20:40:02 +0100 Subject: [PATCH] KubeVirt small cleanup: Flavor and PodAffinity (#1494) Signed-off-by: Helene Durand Signed-off-by: Helene Durand --- examples/kubevirt-machinedeployment.yaml | 8 -------- .../provisioning/testdata/machinedeployment-kubevirt.yaml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/examples/kubevirt-machinedeployment.yaml b/examples/kubevirt-machinedeployment.yaml index 41fe29c57..86ada4d3d 100644 --- a/examples/kubevirt-machinedeployment.yaml +++ b/examples/kubevirt-machinedeployment.yaml @@ -38,9 +38,6 @@ spec: preference: name: "sockets-advantage" kind: "VirtualMachinePreference" # Allowed values: "VirtualMachinePreference"/"VirtualMachineClusterPreference" - # will be deprecated: in favor instancetype and preference - flavor: - name: "kubermatic-standard" template: cpus: "1" memory: "2048M" @@ -49,10 +46,6 @@ spec: size: "10Gi" storageClassName: kubermatic-fast affinity: - # Deprecated: Use topologySpreadConstraints instead. - podAffinityPreset: "" # Allowed values: "", "soft", "hard" - # Deprecated: Use topologySpreadConstraints instead. - podAntiAffinityPreset: "" # Allowed values: "", "soft", "hard" nodeAffinityPreset: type: "" # Allowed values: "", "soft", "hard" key: "foo" @@ -62,7 +55,6 @@ spec: - maxSkew: "1" topologyKey: "kubernetes.io/hostname" whenUnsatisfiable: "" # Allowed values: "DoNotSchedule", "ScheduleAnyway" - # Can also be `centos`, must align with he configured registryImage above operatingSystem: "ubuntu" operatingSystemSpec: diff --git a/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml b/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml index 184427fa8..9c3eaab9b 100644 --- a/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml +++ b/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml @@ -43,14 +43,6 @@ spec: dnsConfig: nameservers: - 8.8.8.8 - affinity: - podAffinityPreset: "" # Allowed values: "", "soft", "hard" - podAntiAffinityPreset: "" # Allowed values: "", "soft", "hard" - nodeAffinityPreset: - type: "" # Allowed values: "", "soft", "hard" - key: "foo" - values: - - bar operatingSystem: "<< OS_NAME >>" operatingSystemSpec: distUpgradeOnBoot: false