Skip to content

Commit 19fc3aa

Browse files
author
Valeriy Khorunzhin
committed
no provide
Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>
1 parent 2f49d84 commit 19fc3aa

4 files changed

Lines changed: 4 additions & 13 deletions

File tree

api/core/v1alpha2/vmcondition/condition.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ const (
172172
ReasonPodTerminating RunningReason = "PodTerminating"
173173
ReasonPodNotFound RunningReason = "PodNotFound"
174174
ReasonPodConditionMissing RunningReason = "PodConditionMissing"
175-
ReasonBootFailed RunningReason = "BootFailed"
176175
ReasonGuestNotRunning RunningReason = "GuestNotRunning"
177176
)
178177

images/edk2/werf.inc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ shell:
102102
echo "Applying patches..."
103103
for p in /src/patches/*.patch; do
104104
[ -f "$p" ] || continue
105-
echo "Applying $p"
106-
git apply "$p"
105+
echo -n "Apply ${p} ... "
106+
git apply --ignore-space-change --ignore-whitespace ${p} && echo OK || (echo FAIL ; exit 1)
107107
done
108108
109109
---

images/virt-artifact/werf.inc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ shell:
1616
install:
1717
- |
1818
echo "Git clone {{ $gitRepoName }} repository..."
19-
echo "kek231dddd"
20-
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v1.6.2-virtualization-no-bootable /src/kubevirt
19+
echo "kek231dddd1"
20+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch chore/vm/receive-qmp /src/kubevirt
2121
2222
rm -rf /src/kubevirt/.git
2323

images/virtualization-artifact/pkg/controller/vm/internal/lifecycle.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,6 @@ func (h *LifeCycleHandler) syncRunning(ctx context.Context, vm *v1alpha2.Virtual
206206
if kvvmi != nil && vm.Status.Phase != v1alpha2.MachineStopped {
207207
vm.Status.Node = kvvmi.Status.NodeName
208208

209-
for _, c := range kvvmi.Status.Conditions {
210-
if string(c.Type) == "BootFailed" {
211-
cb.Reason(vmcondition.ReasonBootFailed).Status(metav1.ConditionTrue).Message(c.Message)
212-
conditions.SetCondition(cb, &vm.Status.Conditions)
213-
return nil
214-
}
215-
}
216-
217209
if vm.Status.Phase == v1alpha2.MachineRunning {
218210
cb.Reason(vmcondition.ReasonVirtualMachineRunning).Status(metav1.ConditionTrue)
219211
conditions.SetCondition(cb, &vm.Status.Conditions)

0 commit comments

Comments
 (0)