From 426c1ab0a4b80586493caea95931502c4c1da057 Mon Sep 17 00:00:00 2001 From: Guohua Ouyang Date: Wed, 19 Sep 2018 11:03:04 +0800 Subject: [PATCH] Move label "kubevirt.io/os" to spec Fixes #1403 Signed-off-by: Guohua Ouyang --- cluster/examples/vm-template-fedora.yaml | 2 +- cluster/examples/vm-template-rhel7.yaml | 2 +- cluster/examples/vm-template-windows2012r2.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/examples/vm-template-fedora.yaml b/cluster/examples/vm-template-fedora.yaml index 626f1054758b..431dace63070 100644 --- a/cluster/examples/vm-template-fedora.yaml +++ b/cluster/examples/vm-template-fedora.yaml @@ -7,7 +7,6 @@ metadata: tags: kubevirt,ocp,template,linux,virtualmachine creationTimestamp: null labels: - kubevirt.io/os: fedora27 miq.github.io/kubevirt-is-vm-template: "true" name: vm-template-fedora objects: @@ -25,6 +24,7 @@ objects: creationTimestamp: null labels: kubevirt-vm: vm-${NAME} + kubevirt.io/os: fedora27 spec: domain: cpu: diff --git a/cluster/examples/vm-template-rhel7.yaml b/cluster/examples/vm-template-rhel7.yaml index fb822949ff01..220aee3ef7c8 100644 --- a/cluster/examples/vm-template-rhel7.yaml +++ b/cluster/examples/vm-template-rhel7.yaml @@ -7,7 +7,6 @@ metadata: tags: kubevirt,ocp,template,linux,virtualmachine creationTimestamp: null labels: - kubevirt.io/os: rhel-7.4 miq.github.io/kubevirt-is-vm-template: "true" name: vm-template-rhel7 objects: @@ -25,6 +24,7 @@ objects: creationTimestamp: null labels: kubevirt-vm: vm-${NAME} + kubevirt.io/os: rhel-7.4 spec: domain: cpu: diff --git a/cluster/examples/vm-template-windows2012r2.yaml b/cluster/examples/vm-template-windows2012r2.yaml index e43c17aeec8d..e7dccde5d393 100644 --- a/cluster/examples/vm-template-windows2012r2.yaml +++ b/cluster/examples/vm-template-windows2012r2.yaml @@ -7,7 +7,6 @@ metadata: tags: kubevirt,ocp,template,windows,virtualmachine creationTimestamp: null labels: - kubevirt.io/os: win2k12r2 miq.github.io/kubevirt-is-vm-template: "true" name: vm-template-windows2012r2 objects: @@ -25,6 +24,7 @@ objects: creationTimestamp: null labels: kubevirt-vm: vm-${NAME} + kubevirt.io/os: win2k12r2 spec: domain: clock: