From fceec9c868a0cfce51f41da1e68e0f542bb8619b Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 8 Dec 2025 09:16:32 +0100 Subject: [PATCH 1/2] Python-39 UBI8 reached EOL in Nov 2025 This pull request deprecates this image https://issues.redhat.com/browse/RHEL-124844 Signed-off-by: Petr "Stone" Hracek --- .../redhat-python-imagestreams/src/Chart.yaml | 4 ++-- .../src/templates/python-imagestream.yaml | 16 ------------- tests/test_python_imagestreams.py | 24 +++++++++---------- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/charts/redhat/redhat-python-imagestreams/src/Chart.yaml b/charts/redhat/redhat-python-imagestreams/src/Chart.yaml index bf3dbf8..b1888e3 100644 --- a/charts/redhat/redhat-python-imagestreams/src/Chart.yaml +++ b/charts/redhat/redhat-python-imagestreams/src/Chart.yaml @@ -7,10 +7,10 @@ annotations: charts.openshift.io/provider: Red Hat charts.openshift.io/providerType: redhat apiVersion: v2 -appVersion: 0.0.3 +appVersion: 0.0.4 kubeVersion: '>=1.20.0' name: redhat-python-imagestreams tags: builder,python sources: - https://github.com/sclorg/helm-charts -version: 0.0.3 +version: 0.0.4 diff --git a/charts/redhat/redhat-python-imagestreams/src/templates/python-imagestream.yaml b/charts/redhat/redhat-python-imagestreams/src/templates/python-imagestream.yaml index 29b75c6..74099bd 100644 --- a/charts/redhat/redhat-python-imagestreams/src/templates/python-imagestream.yaml +++ b/charts/redhat/redhat-python-imagestreams/src/templates/python-imagestream.yaml @@ -136,22 +136,6 @@ spec: name: registry.redhat.io/ubi8/python-311:latest referencePolicy: type: Local - - name: 3.9-ubi8 - annotations: - openshift.io/display-name: Python 3.9 (UBI 8) - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Python 3.9 applications on UBI 8. For more information - about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md. - iconClass: icon-python - tags: builder,python - supports: python:3.9,python - version: '3.9' - sampleRepo: https://github.com/sclorg/django-ex.git - from: - kind: DockerImage - name: registry.redhat.io/ubi8/python-39:latest - referencePolicy: - type: Local - name: 3.6-ubi8 annotations: openshift.io/display-name: Python 3.6 (UBI 8) diff --git a/tests/test_python_imagestreams.py b/tests/test_python_imagestreams.py index 34bf685..92d8532 100644 --- a/tests/test_python_imagestreams.py +++ b/tests/test_python_imagestreams.py @@ -20,20 +20,20 @@ class TestHelmRHELPythonImageStreams: @pytest.mark.parametrize( - "version,registry", + "version,registry,expected", [ - ("3.12-minimal-ubi10", "registry.redhat.io/ubi10/python-312-minimal:latest"), - ("3.12-minimal-ubi9", "registry.redhat.io/ubi9/python-312-minimal:latest"), - ("3.12-ubi9", "registry.redhat.io/ubi9/python-312:latest"), - ("3.12-ubi8", "registry.redhat.io/ubi8/python-312:latest"), - ("3.11-ubi9", "registry.redhat.io/ubi9/python-311:latest"), - ("3.11-ubi8", "registry.redhat.io/ubi8/python-311:latest"), - ("3.9-ubi9", "registry.redhat.io/ubi9/python-39:latest"), - ("3.9-ubi8", "registry.redhat.io/ubi8/python-39:latest"), - ("3.6-ubi8", "registry.redhat.io/ubi8/python-36:latest"), + ("3.12-minimal-ubi10", "registry.redhat.io/ubi10/python-312-minimal:latest", True), + ("3.12-minimal-ubi9", "registry.redhat.io/ubi9/python-312-minimal:latest", True), + ("3.12-ubi9", "registry.redhat.io/ubi9/python-312:latest", True), + ("3.12-ubi8", "registry.redhat.io/ubi8/python-312:latest", True), + ("3.11-ubi9", "registry.redhat.io/ubi9/python-311:latest", True), + ("3.11-ubi8", "registry.redhat.io/ubi8/python-311:latest", True), + ("3.9-ubi9", "registry.redhat.io/ubi9/python-39:latest", False), + ("3.9-ubi8", "registry.redhat.io/ubi8/python-39:latest", True), + ("3.6-ubi8", "registry.redhat.io/ubi8/python-36:latest", True), ], ) - def test_package_imagestream(self, helm_api, version, registry): + def test_package_imagestream(self, helm_api, version, registry, expected): assert helm_api.helm_package() assert helm_api.helm_installation() - assert helm_api.check_imagestreams(version=version, registry=registry) + assert helm_api.check_imagestreams(version=version, registry=registry) == expected From 05f9782d08c57bbeef01abbc929266d1773e1bfa Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 8 Dec 2025 13:47:00 +0100 Subject: [PATCH 2/2] Fix typo in pull request. Signed-off-by: Petr "Stone" Hracek --- tests/test_python_imagestreams.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_python_imagestreams.py b/tests/test_python_imagestreams.py index 92d8532..379850d 100644 --- a/tests/test_python_imagestreams.py +++ b/tests/test_python_imagestreams.py @@ -28,8 +28,8 @@ class TestHelmRHELPythonImageStreams: ("3.12-ubi8", "registry.redhat.io/ubi8/python-312:latest", True), ("3.11-ubi9", "registry.redhat.io/ubi9/python-311:latest", True), ("3.11-ubi8", "registry.redhat.io/ubi8/python-311:latest", True), - ("3.9-ubi9", "registry.redhat.io/ubi9/python-39:latest", False), - ("3.9-ubi8", "registry.redhat.io/ubi8/python-39:latest", True), + ("3.9-ubi9", "registry.redhat.io/ubi9/python-39:latest", True), + ("3.9-ubi8", "registry.redhat.io/ubi8/python-39:latest", False), ("3.6-ubi8", "registry.redhat.io/ubi8/python-36:latest", True), ], )