Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/mas/devops/ocp.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,20 @@ def getClusterVersion(dynClient: DynamicClient) -> str:
clusterVersion = clusterVersionAPI.get(name="version")
for record in clusterVersion.status.history:
if record.state == "Completed":
return record.state.version
return record.version
except NotFoundError:
logger.debug("Unable to retrieve ClusterVersion")
return None


def isClusterVersionInRange(version: str, releases: list[str]) -> bool:
if releases is not None:
for release in releases:
if version.startswith(f"{release}."):
return True
return False


def getNamespace(dynClient: DynamicClient, namespace: str) -> dict:
"""
Get a namespace
Expand Down
11 changes: 11 additions & 0 deletions test/src/test_ocp.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@
from mas.devops import ocp


def test_is_cluster_in_range():
assert ocp.isClusterVersionInRange("4.1.6", None) is False
assert ocp.isClusterVersionInRange("4.1.6", []) is False
assert ocp.isClusterVersionInRange("4.1.6", ["4.16", "4.17", "4.18"]) is False
assert ocp.isClusterVersionInRange("4.12.6", ["4.16", "4.17", "4.18"]) is False
assert ocp.isClusterVersionInRange("4.15.6", ["4.16", "4.17", "4.18"]) is False
assert ocp.isClusterVersionInRange("4.16.0", ["4.16", "4.17", "4.18"]) is True
assert ocp.isClusterVersionInRange("4.18.1", ["4.16", "4.17", "4.18"]) is True
assert ocp.isClusterVersionInRange("5.0.0", ["4.16", "4.17", "4.18"]) is False


def test_execInPod_success(mocker):

mock_CoreV1Api = mocker.patch('kubernetes.client.CoreV1Api')
Expand Down