Skip to content

Commit fcda102

Browse files
fix
Signed-off-by: Yaroslav Borbat <yaroslav.borbat@flant.com>
1 parent 03c9d99 commit fcda102

File tree

6 files changed

+8
-18
lines changed

6 files changed

+8
-18
lines changed

build/components/versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ firmware:
33
libvirt: v10.9.0
44
edk2: stable202411
55
core:
6-
3p-kubevirt: v1.6.2-v12n.newversion2 # v1.3.1-v12n.24
6+
3p-kubevirt: v1.3.1-v12n.24
77
3p-containerized-data-importer: v1.60.3-v12n.12
88
distribution: 2.8.3
99
package:

images/libvirt/install-libvirt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ $SRC_BUILD/src/libvirt_functions.stp to /usr/share/systemtap/tapset
185185
$SRC_BUILD/tools/virt-host-validate to /usr/bin
186186
# $SRC_BUILD/tools/virt-login-shell to /usr/bin
187187
# $SRC_BUILD/tools/virt-login-shell-helper to /usr/libexec
188-
$SRC_BUILD/tools/virsh to /usr/bin # TODO: for test
188+
# $SRC_BUILD/tools/virsh to /usr/bin
189189
# $SRC_BUILD/tools/virt-admin to /usr/bin
190190
$SRC_BUILD/tools/virt-pki-validate to /usr/bin
191191
$SRC_BUILD/tools/virt-pki-query-dn to /usr/bin

images/virt-artifact/werf.inc.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
1010
final: false
1111
fromImage: builder/src
12-
fromCacheVersion: 000003
1312
secrets:
1413
- id: SOURCE_REPO
1514
value: {{ $.SOURCE_REPO }}
@@ -87,9 +86,9 @@ shell:
8786
cd /kubevirt
8887
8988
go mod download
90-
go work vendor
89+
go mod vendor
9190
92-
for p in $(test -d patches && ls -1 patches/*.patch 2>/dev/null) ; do
91+
for p in patches/*.patch ; do
9392
echo -n "Apply ${p} ... "
9493
git apply --ignore-space-change --ignore-whitespace ${p} && echo OK || (echo FAIL ; exit 1)
9594
done

images/virt-handler/werf.inc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ import:
2525
- virt-chroot
2626
- virt-handler
2727
- container-disk
28+
- image: {{ .ModuleNamePrefix }}virt-artifact
29+
add: /kubevirt/cmd/{{ $.ImageName }}/virt_launcher.cil
30+
to: /virt_launcher.cil
31+
after: install
2832
- image: {{ .ModuleNamePrefix }}virt-artifact
2933
add: /kubevirt-config-files/.version
3034
to: /.version

templates/kubevirt/virt-operator/rbac-for-us.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -836,9 +836,6 @@ rules:
836836
- virtualmachineinstances/userlist
837837
- virtualmachineinstances/sev/fetchcertchain
838838
- virtualmachineinstances/sev/querylaunchmeasurement
839-
- virtualmachineinstances/usbredir
840-
- virtualmachines/objectgraph
841-
- virtualmachineinstances/objectgraph
842839
verbs:
843840
- get
844841
- apiGroups:
@@ -851,7 +848,6 @@ rules:
851848
- virtualmachineinstances/freeze
852849
- virtualmachineinstances/unfreeze
853850
- virtualmachineinstances/softreboot
854-
- virtualmachineinstances/reset
855851
- virtualmachineinstances/sev/setupsession
856852
- virtualmachineinstances/sev/injectlaunchsecret
857853
verbs:
@@ -1220,15 +1216,6 @@ rules:
12201216
- subjectaccessreviews
12211217
verbs:
12221218
- create
1223-
- apiGroups:
1224-
- resource.k8s.io
1225-
resources:
1226-
- resourceclaims
1227-
- resourceslices
1228-
verbs:
1229-
- get
1230-
- list
1231-
- watch
12321219
---
12331220
apiVersion: rbac.authorization.k8s.io/v1
12341221
kind: ClusterRoleBinding

0 commit comments

Comments
 (0)