Skip to content

Commit f5eee82

Browse files
AntonFomichev-FlantAntonFomichev-Flant
authored
Merge branch 'main' into feat/pm_include
2 parents 399488f + e0b697c commit f5eee82

126 files changed

Lines changed: 1520 additions & 12216 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/e2e-matrix.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ jobs:
344344
date_start: ${{ needs.set-vars.outputs.date_start }}
345345
randuuid4c: ${{ needs.set-vars.outputs.randuuid4c }}
346346
cluster_config_workers_memory: "10Gi"
347+
cluster_config_k8s_version: "1.34" # Needed for testing USB devices
347348
secrets:
348349
DEV_REGISTRY_DOCKER_CFG: ${{ secrets.DEV_REGISTRY_DOCKER_CFG }}
349350
VIRT_E2E_NIGHTLY_SA_TOKEN: ${{ secrets.VIRT_E2E_NIGHTLY_SA_TOKEN }}
@@ -367,6 +368,7 @@ jobs:
367368
date_start: ${{ needs.set-vars.outputs.date_start }}
368369
randuuid4c: ${{ needs.set-vars.outputs.randuuid4c }}
369370
cluster_config_workers_memory: "9Gi"
371+
cluster_config_k8s_version: "Automatic"
370372
secrets:
371373
DEV_REGISTRY_DOCKER_CFG: ${{ secrets.DEV_REGISTRY_DOCKER_CFG }}
372374
VIRT_E2E_NIGHTLY_SA_TOKEN: ${{ secrets.VIRT_E2E_NIGHTLY_SA_TOKEN }}

‎.github/workflows/e2e-reusable-pipeline.yml‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ on:
2525
required: true
2626
type: string
2727
description: "Random UUID first 4 chars"
28+
cluster_config_k8s_version:
29+
required: false
30+
type: string
31+
default: "Automatic"
32+
description: "Set k8s version for cluster config, like 1.34, 1.36 (without patch version)"
2833
cluster_config_workers_memory:
2934
required: false
3035
type: string
@@ -109,14 +114,15 @@ env:
109114
DEFAULT_USER: ${{ inputs.default_user }}
110115
GO_VERSION: ${{ inputs.go_version }}
111116
SETUP_CLUSTER_TYPE_PATH: test/dvp-static-cluster
117+
K8S_VERSION: ${{ inputs.cluster_config_k8s_version }}
112118

113119
defaults:
114120
run:
115121
shell: bash
116122

117123
jobs:
118124
bootstrap:
119-
name: Bootstrap cluster (${{ inputs.storage_type }})
125+
name: Bootstrap cluster
120126
runs-on: ubuntu-latest
121127
concurrency:
122128
group: "${{ github.workflow }}-${{ github.event.number || github.ref }}-${{ inputs.storage_type }}"
@@ -193,7 +199,7 @@ jobs:
193199
channel: ${{ env.DECKHOUSE_CHANNEL }}
194200
podSubnetCIDR: ${{ inputs.pod_subnet_cidr }}
195201
serviceSubnetCIDR: ${{ inputs.service_subnet_cidr }}
196-
kubernetesVersion: Automatic
202+
kubernetesVersion: ${{ env.K8S_VERSION }}
197203
registryDockerCfg: ${{ secrets.PROD_IO_REGISTRY_DOCKER_CFG }}
198204
bundle: Default
199205
proxyEnabled: false
@@ -427,7 +433,7 @@ jobs:
427433
retention-days: 3
428434

429435
configure-storage:
430-
name: Configure storage (${{ inputs.storage_type }})
436+
name: Configure storage
431437
runs-on: ubuntu-latest
432438
needs: bootstrap
433439
steps:
@@ -1117,7 +1123,7 @@ jobs:
11171123
virt_handler_ready
11181124
11191125
e2e-test:
1120-
name: E2E test (${{ inputs.storage_type }})
1126+
name: E2E test
11211127
runs-on: ubuntu-latest
11221128
needs:
11231129
- bootstrap
@@ -1279,35 +1285,8 @@ jobs:
12791285
if-no-files-found: ignore
12801286
retention-days: 3
12811287

1282-
# temporary disabled
1283-
# unpin-cluster-nodes:
1284-
# name: Unpin cluster nodes
1285-
# runs-on: ubuntu-latest
1286-
# needs:
1287-
# - bootstrap
1288-
# - e2e-test
1289-
# steps:
1290-
# - uses: actions/checkout@v4
1291-
# - name: Configure kubectl via azure/k8s-set-context@v4
1292-
# uses: azure/k8s-set-context@v4
1293-
# with:
1294-
# method: kubeconfig
1295-
# context: e2e-cluster-nightly-e2e-virt-sa
1296-
# kubeconfig: ${{ secrets.VIRT_E2E_NIGHTLY_SA_TOKEN }}
1297-
1298-
# - name: Unpin cluster nodes
1299-
# env:
1300-
# NAMESPACE: ${{ needs.e2e-test.outputs.namespace }}
1301-
# run: |
1302-
# for vm in $(kubectl -n $NAMESPACE get vm -o name); do
1303-
# echo "[INFO] Unpin VM $vm"
1304-
# pinNode=$(kubectl -n $NAMESPACE get vm $vm jsonpath='{.status.nodeName}')
1305-
# echo "[INFO] Unping VM $vm from node $pinNode"
1306-
# kubectl -n $NAMESPACE patch vm $vm --type json --patch '{"op": "remove", "path": "/spec/nodeSelector"}'
1307-
# done
1308-
13091288
prepare-report:
1310-
name: Prepare E2E report (${{ inputs.storage_type }})
1289+
name: Prepare E2E report
13111290
runs-on: ubuntu-latest
13121291
needs:
13131292
- bootstrap
@@ -1474,7 +1453,7 @@ jobs:
14741453
echo "[INFO] Artifact name: $ARTIFACT_NAME"
14751454
14761455
undeploy-cluster:
1477-
name: Undeploy cluster (${{ inputs.storage_type }})
1456+
name: Undeploy cluster
14781457
runs-on: ubuntu-latest
14791458
needs:
14801459
- bootstrap

‎CHANGELOG/CHANGELOG-v1.5.2.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
core:
2+
fixes:
3+
- summary: Fixed a potential `OOMKill` during virtual disk creation on NFS.
4+
pull_request: https://github.com/deckhouse/virtualization/pull/2029
5+

‎CHANGELOG/CHANGELOG-v1.5.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
## Fixes
1010

1111

12+
- **[core]** Fixed a potential `OOMKill` during virtual disk creation on NFS. [#2029](https://github.com/deckhouse/virtualization/pull/2029)
1213
- **[core]** Fixed an issue with starting virtual machines using the `EFIWithSecureBoot` bootloader when configured with more than 12 vCPUs. [#1916](https://github.com/deckhouse/virtualization/pull/1916)
1314
- **[module]** Platform system components in user projects are protected from deletion by users. [#1880](https://github.com/deckhouse/virtualization/pull/1880)
1415
- **[module]** During virtual machine migration, temporary double consumption of resources is no longer counted in project quotas. System component resources required for starting and running virtual machines are no longer counted in project quotas. [#1872](https://github.com/deckhouse/virtualization/pull/1872)

‎build/components/versions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ firmware:
44
edk2: stable202411
55
core:
66
3p-kubevirt: v1.6.2-v12n.12
7-
3p-containerized-data-importer: v1.60.3-v12n.15
7+
3p-containerized-data-importer: v1.60.3-v12n.16
88
distribution: 2.8.3
99
package:
1010
acl: v2.3.1

‎crds/clustervirtualimages.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ spec:
5656
> This resource cannot be modified once it has been created.
5757
5858
With this resource in the cluster, a container image is created and stored in a dedicated Deckhouse Virtualization Container Registry (DVCR).
59+
60+
**Note:** The `metadata.name` field must comply with [Kubernetes object naming conventions](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/) and must not exceed 48 characters.
5961
properties:
6062
apiVersion:
6163
description: |-

‎crds/doc-ru-clustervirtualimages.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ spec:
99
> Этот ресурс не может быть изменён после создания.
1010
1111
После появления в кластере этого ресурса создаётся образ контейнера, который хранится в специальном реестре контейнеров Deckhouse Virtualization Container Registry (DVCR).
12+
13+
**Важно:** Поле `metadata.name` должно соответствовать [правилам именования объектов Kubernetes](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/) и не должно превышать 48 символов.
1214
properties:
1315
spec:
1416
properties:

‎crds/doc-ru-virtualdisks.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ spec:
88
99
После создания VirtualDisk можно изменить только размер диска с помощью поля `.spec.persistentVolumeClaim.size`. Все остальные поля изменить нельзя.
1010
11+
**Важно:** Поле `metadata.name` должно соответствовать [правилам именования объектов Kubernetes](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/) и не должно превышать 60 символов.
1112
properties:
1213
spec:
1314
properties:

‎crds/doc-ru-virtualimages.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ spec:
99
> Этот ресурс не может быть изменён после создания.
1010
1111
После появления в кластере этого ресурса создаётся образ контейнера, который хранится в специальном реестре контейнеров Deckhouse Virtualization Container Registry (DVCR).
12+
13+
**Важно:** Поле `metadata.name` должно соответствовать [правилам именования объектов Kubernetes](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/) и не должно превышать 49 символов.
1214
properties:
1315
spec:
1416
properties:

‎crds/doc-ru-virtualmachines.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ spec:
1111
- `.metadata.annotations`;
1212
- `.spec.disruptions.restartApprovalMode`.
1313
- `.spec.runPolicy`.
14+
15+
**Важно:** Поле `metadata.name` должно соответствовать [правилам именования объектов Kubernetes](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/) и не должно превышать 63 символов.
1416
properties:
1517
spec:
1618
properties:

0 commit comments

Comments
 (0)