Skip to content
This repository was archived by the owner on Jun 12, 2023. It is now read-only.

Commit b32678e

Browse files
authored
Merge pull request #106 from ksimon1/feature/renameUseKVM
rename use_kvm to useKVM
2 parents 7f5e58f + 83528c8 commit b32678e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

functests/node-labeller-unversioned-cr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: KubevirtNodeLabellerBundle
33
metadata:
44
name: kubevirt-node-labeller-bundle
55
spec:
6-
use_kvm: false
6+
useKVM: false

pkg/apis/kubevirt/v1/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ type VersionSpec struct {
7070

7171
type ComponentSpec struct {
7272
Version string `json:"version,omitempty"`
73-
UseKVM bool `json:"use_kvm"`
73+
UseKVM bool `json:"useKVM"`
7474
}
7575

7676
type TemplateValidatorSpec struct {

roles/KubevirtNodeLabeller/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# defaults file for KubevirtNodeLabeller
33
wait: true
4-
use_kvm: true
4+
useKVM: true
55
kubevirt_node_labeller_image: "node-labeller"
66
kvm_info_nfd_plugin_image: "kvm-info-nfd-plugin"
77
kubevirt_cpu_nfd_plugin_image: "cpu-nfd-plugin"

roles/KubevirtNodeLabeller/templates/kubevirt-node-labeller-ds.yaml.j2

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ spec:
4646
- name: libvirt
4747
image: {{ ssp_registry | default('kubevirt') }}/{{ image_name_prefix }}{{ virt_launcher_image }}:{{ virt_launcher_tag }}
4848
command: ["/bin/sh","-c"]
49-
{% if use_kvm %}
49+
{% if useKVM %}
5050
args: ["libvirtd -d; chmod o+rw /dev/kvm; virsh domcapabilities --machine q35 --arch x86_64 --virttype kvm > /etc/kubernetes/node-feature-discovery/source.d/virsh_domcapabilities.xml; cp -r /usr/share/libvirt/cpu_map /etc/kubernetes/node-feature-discovery/source.d/"]
5151
{% else %}
5252
args: ["libvirtd -d; virsh domcapabilities --machine q35 --arch x86_64 --virttype qemu > /etc/kubernetes/node-feature-discovery/source.d/virsh_domcapabilities.xml; cp -r /usr/share/libvirt/cpu_map /etc/kubernetes/node-feature-discovery/source.d/"]
5353
{% endif %}
5454
imagePullPolicy: Always
55-
{% if use_kvm %}
55+
{% if useKVM %}
5656
securityContext:
5757
privileged: true
5858
resources:
@@ -71,7 +71,7 @@ spec:
7171
fieldRef:
7272
fieldPath: spec.nodeName
7373
image: {{ ssp_registry | default('quay.io/kubevirt') }}/{{ image_name_prefix }}{{ kubevirt_node_labeller_image }}:{{ kubevirt_node_labeller_tag }}
74-
{% if use_kvm %}
74+
{% if useKVM %}
7575
securityContext:
7676
privileged: true
7777
resources:

0 commit comments

Comments
 (0)