Skip to content

Commit 34ed502

Browse files
authored
Merge branch 'main' into testCustomCliDownload
2 parents 53dbb14 + 6cc29ce commit 34ed502

11 files changed

Lines changed: 360 additions & 352 deletions

File tree

.github/workflows/cherrypick-to-4.99.yml

Lines changed: 337 additions & 335 deletions
Large diffs are not rendered by default.

.github/workflows/component-builder-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Install uv
3939
uses: astral-sh/setup-uv@v5
4040
with:
41-
version: "0.6.11"
41+
version: "0.8.22"
4242
- name: Create VM
4343
working-directory: ./containers/fedora
4444
env:

.github/workflows/component-builder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install uv
3737
uses: astral-sh/setup-uv@v5
3838
with:
39-
version: "0.6.11"
39+
version: "0.8.22"
4040
- name: Create VM
4141
working-directory: ./containers/fedora
4242
env:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
stages: [pre-commit]
1414

1515
- repo: https://github.com/astral-sh/ruff-pre-commit
16-
rev: v0.13.0
16+
rev: v0.13.1
1717
hooks:
1818
- id: ruff
1919
stages: [pre-commit]
@@ -65,7 +65,7 @@ repos:
6565
- id: gitleaks
6666

6767
- repo: https://github.com/pre-commit/mirrors-mypy
68-
rev: v1.18.1
68+
rev: v1.18.2
6969
hooks:
7070
- id: mypy
7171
exclude: "test_(.*).py$"

OWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
approvers:
2-
- myakove
2+
- rnetser
33
- vsibirsk
44
- dshchedr
5-
- rnetser
5+
- myakove
66
reviewers:
77
- RoniKishner
88
- vsibirsk

renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
{
2020
"matchPackagePatterns": ["*"],
2121
"groupName": "python-deps"
22+
},
23+
{
24+
"matchManagers": ["pep621"],
25+
"matchPackageNames": ["python"],
26+
"matchUpdateTypes": ["major"],
27+
"enabled": false
2228
}
2329
]
2430
}

tests/install_upgrade_operators/csv/csv_permissions_audit/csv-permissions.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2718,6 +2718,8 @@ kubevirt-operator:
27182718
- get
27192719
- list
27202720
- watch
2721+
- patch
2722+
- delete
27212723
- apiGroups:
27222724
- kubevirt.io
27232725
resources:

tests/network/OWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ reviewers:
66
- Anatw
77
- EdDev
88
- servolkov
9+
- azhivovk

tests/observability/conftest.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@ def virt_operator_deployment(hco_namespace):
101101

102102
@pytest.fixture(scope="module")
103103
def initial_virt_operator_replicas(prometheus, virt_operator_deployment, hco_namespace):
104-
virt_operator_deployment_initial_replicas = str(virt_operator_deployment.instance.status.replicas)
104+
virt_operator_deployment.wait_for_replicas()
105+
virt_operator_deployment_initial_replicas = virt_operator_deployment.instance.status.replicas
105106
assert virt_operator_deployment_initial_replicas, f"Not replicas found for {VIRT_OPERATOR}"
106-
return virt_operator_deployment_initial_replicas
107+
return str(virt_operator_deployment_initial_replicas)
107108

108109

109110
@pytest.fixture(scope="class")

tests/storage/test_cdi_certificate.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import datetime
88
import logging
99
import subprocess
10-
import time
1110

1211
import pytest
1312
from ocp_resources.cdi import CDI
@@ -83,14 +82,11 @@ def valid_cdi_certificates(secrets):
8382
LOGGER.info(f"Checking {cdi_secret}...")
8483

8584
start = secret.certificate_not_before
86-
start_timestamp = time.mktime(time.strptime(start, RFC3339_FORMAT))
87-
8885
end = secret.certificate_not_after
89-
end_timestamp = time.mktime(time.strptime(end, RFC3339_FORMAT))
90-
91-
current_time = datetime.datetime.now().strftime(RFC3339_FORMAT)
92-
current_timestamp = time.mktime(time.strptime(current_time, RFC3339_FORMAT))
93-
assert start_timestamp <= current_timestamp <= end_timestamp, f"Certificate of {cdi_secret} expired"
86+
start_dt = datetime.datetime.strptime(start, RFC3339_FORMAT).replace(tzinfo=datetime.timezone.utc)
87+
end_dt = datetime.datetime.strptime(end, RFC3339_FORMAT).replace(tzinfo=datetime.timezone.utc)
88+
now_dt = datetime.datetime.now(datetime.timezone.utc)
89+
assert start_dt <= now_dt <= end_dt, f"Certificate of {cdi_secret} not valid at current time"
9490

9591

9692
@pytest.fixture()

0 commit comments

Comments
 (0)