diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/kustomization.yaml index f2c2b718..e3c2aaf8 100644 --- a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/kustomization.yaml @@ -5,4 +5,3 @@ resources: - configure-bond0 - configure-sysctl-ip-forward - hostpath-provisioner-selinux-controller.yaml - - pci-passthrough diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-iommu.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-iommu.yaml deleted file mode 100644 index aa9095ea..00000000 --- a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-iommu.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: machineconfiguration.openshift.io/v1 -kind: MachineConfig -metadata: - labels: - machineconfiguration.openshift.io/role: worker - name: 100-worker-iommu -spec: - config: - ignition: - version: 3.2.0 - kernelArguments: - - intel_iommu=on diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-vfiopci.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-vfiopci.yaml deleted file mode 100644 index c580d531..00000000 --- a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-vfiopci.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Butane; do not edit -apiVersion: machineconfiguration.openshift.io/v1 -kind: MachineConfig -metadata: - labels: - machineconfiguration.openshift.io/role: worker - name: 100-worker-vfiopci -spec: - config: - ignition: - version: 3.4.0 - storage: - files: - - contents: - compression: "" - source: data:,options%20vfio-pci%20ids%3D10de%3A1db6%2C10de%3A20b0%0A - mode: 420 - overwrite: true - path: /etc/modprobe.d/vfio.conf - - contents: - compression: "" - source: data:,vfio-pci - mode: 420 - overwrite: true - path: /etc/modules-load.d/vfio-pci.conf diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/Makefile b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/Makefile deleted file mode 100644 index 5b9c8a5a..00000000 --- a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -MACHINECONFIGS = \ - 100-worker-vfiopci.yaml - -%.yaml: src/%.bu - butane -o $@ -d src $< - -all: $(MACHINECONFIGS) - -clean: - rm -f $(MACHINECONFIGS) diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/kustomization.yaml deleted file mode 100644 index 04889097..00000000 --- a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - 100-worker-iommu.yaml - - 100-worker-vfiopci.yaml diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/src/100-worker-vfiopci.bu b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/src/100-worker-vfiopci.bu deleted file mode 100644 index 28440238..00000000 --- a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/src/100-worker-vfiopci.bu +++ /dev/null @@ -1,19 +0,0 @@ -variant: openshift -version: 4.15.0 -metadata: - name: 100-worker-vfiopci - labels: - machineconfiguration.openshift.io/role: worker -storage: - files: - - path: /etc/modprobe.d/vfio.conf - mode: 0644 - overwrite: true - contents: - inline: | - options vfio-pci ids=10de:1db6,10de:20b0 - - path: /etc/modules-load.d/vfio-pci.conf - mode: 0644 - overwrite: true - contents: - inline: vfio-pci diff --git a/virt/overlays/nerc-ocp-test/hyperconverged.yaml b/virt/overlays/nerc-ocp-test/hyperconverged.yaml deleted file mode 100644 index 8ffea1ac..00000000 --- a/virt/overlays/nerc-ocp-test/hyperconverged.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: hco.kubevirt.io/v1beta1 -kind: HyperConverged -metadata: - name: kubevirt-hyperconverged - namespace: openshift-cnv -spec: - permittedHostDevices: - pciHostDevices: - - pciDeviceSelector: "10DE:1DB6" - resourceName: "nvidia.com/GV100GL_Tesla_V100" - - pciDeviceSelector: "10DE:20B0" - resourceName: "nvidia.com/A100_SXM4_40GB" diff --git a/virt/overlays/nerc-ocp-test/kustomization.yaml b/virt/overlays/nerc-ocp-test/kustomization.yaml index e0bcd724..64985cd7 100644 --- a/virt/overlays/nerc-ocp-test/kustomization.yaml +++ b/virt/overlays/nerc-ocp-test/kustomization.yaml @@ -3,6 +3,3 @@ kind: Kustomization namespace: openshift-cnv resources: - ../../base - -patches: -- path: hyperconverged.yaml