Skip to content

Commit ff219af

Browse files
committed
Switch to stable/oldstable for kubectl related images
1 parent 43bf83e commit ff219af

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

bci_tester/data.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -841,22 +841,20 @@ def create_BCI(
841841
forwarded_ports=[PortForwarding(container_port=80)],
842842
)
843843

844-
_KUBECTL_VERSION_OS_MATRIX: Tuple[Tuple[str, Tuple[str, ...]], ...] = (
845-
("1.28", ("15.6", "15.7")),
846-
("1.30", ("15.7",)),
847-
("1.30", ("tumbleweed",)),
848-
("1.31", ("tumbleweed",)),
849-
("1.32", ("tumbleweed",)),
850-
)
851-
852844
KUBECTL_CONTAINERS = [
853845
create_BCI(
854846
build_tag=f"{APP_CONTAINER_PREFIX}/kubectl:{kubectl_ver}",
855847
bci_type=ImageType.APPLICATION,
856848
available_versions=os_versions,
857849
custom_entry_point="/bin/sh",
858850
)
859-
for kubectl_ver, os_versions in _KUBECTL_VERSION_OS_MATRIX
851+
for kubectl_ver, os_versions in (
852+
("oldstable", ("15.6", "15.7")),
853+
("stable", ("15.6", "15.7")),
854+
("1.30", ("tumbleweed",)),
855+
("1.31", ("tumbleweed",)),
856+
("1.32", ("tumbleweed",)),
857+
)
860858
]
861859

862860
_KEA_VERSION_OS_MATRIX: Tuple[Tuple[str, Tuple[str, ...]], ...] = (

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ markers = [
105105
'kubectl_1.30',
106106
'kubectl_1.31',
107107
'kubectl_1.32',
108+
'kubectl_oldstable',
109+
'kubectl_stable',
108110
'mariadb_10.11',
109111
'mariadb_latest',
110112
'mariadb-client_10.11',

0 commit comments

Comments
 (0)