From 359e07e5034c20497ff50bba6a9e33c1b0257a1d Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 5 Aug 2024 12:42:32 +0200 Subject: [PATCH 1/2] Copy 0.0.1 -> 0.0.2 Signed-off-by: Petr "Stone" Hracek --- .../0.0.2/src/Chart.yaml | 16 ++ .../0.0.2/src/README.md | 7 + .../src/templates/python-imagestream.yaml | 170 ++++++++++++++++++ .../tests/test-import-imagestream.yaml | 21 +++ .../0.0.2/src/values.schema.json | 9 + .../0.0.2/src/values.yaml | 1 + 6 files changed, 224 insertions(+) create mode 100644 charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml create mode 100644 charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/README.md create mode 100644 charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml create mode 100644 charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/tests/test-import-imagestream.yaml create mode 100644 charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.schema.json create mode 100644 charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.yaml diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml new file mode 100644 index 0000000000..9b52da965b --- /dev/null +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml @@ -0,0 +1,16 @@ +description: |- + This content is experimental, do not use it in production. Python imagestreams for using on OpenShift 4. + For more information about using this builder image, including OpenShift considerations, + see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md. +annotations: + charts.openshift.io/name: Red Hat Python imagestreams (experimental). + charts.openshift.io/provider: Red Hat + charts.openshift.io/providerType: redhat +apiVersion: v2 +appVersion: 0.0.1 +kubeVersion: '>=1.20.0' +name: redhat-python-imagestreams +tags: builder,python +sources: + - https://github.com/sclorg/helm-charts +version: 0.0.1 diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/README.md b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/README.md new file mode 100644 index 0000000000..7c30c039eb --- /dev/null +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/README.md @@ -0,0 +1,7 @@ +# Python imagestreams helm chart + +A Helm chart for importing Python imagestreams on OpenShift. + +For more information about helm charts see the official [Helm Charts Documentation](https://helm.sh/). + +You need to have access to a cluster for each operation with OpenShift 4, like deploying and testing. diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml new file mode 100644 index 0000000000..3e2c84f6bd --- /dev/null +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml @@ -0,0 +1,170 @@ +--- +kind: ImageStream +apiVersion: image.openshift.io/v1 +metadata: + name: python + annotations: + openshift.io/display-name: Python +spec: + tags: + - name: latest + annotations: + openshift.io/display-name: Python (Latest) + openshift.io/provider-display-name: Red Hat, Inc. + description: |- + Build and run Python applications on UBI. 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. + + WARNING: By selecting this tag, your application will automatically update to use the latest version of Python available on OpenShift, including major version updates. + iconClass: icon-python + tags: builder,python + supports: python + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: ImageStreamTag + name: 3.9-ubi8 + referencePolicy: + type: Local + - name: 3.11-ubi9 + annotations: + openshift.io/display-name: Python 3.11 (UBI 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.11 applications on UBI 9. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.11,python + version: '3.11' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi9/python-311:latest + referencePolicy: + type: Local + - name: 3.9-ubi9 + annotations: + openshift.io/display-name: Python 3.9 (UBI 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.9 applications on UBI 9. 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/ubi9/python-39:latest + referencePolicy: + type: Local + - name: 3.11-ubi8 + annotations: + openshift.io/display-name: Python 3.11 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.11 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.11/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.11,python + version: '3.11' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + 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.8-ubi8 + annotations: + openshift.io/display-name: Python 3.8 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.8 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.8/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.8,python + version: '3.8' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/python-38:latest + referencePolicy: + type: Local + - name: 3.8-ubi7 + annotations: + openshift.io/display-name: Python 3.8 (UBI 7) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.8 applications on UBI 7. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.8,python + version: '3.8' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi7/python-38:latest + referencePolicy: + type: Local + - name: '3.8' + annotations: + openshift.io/display-name: Python 3.8 + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.8 applications on RHEL 7. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md. + iconClass: icon-python + tags: builder,python,hidden + supports: python:3.8,python + version: '3.8' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/rhscl/python-38-rhel7:latest + referencePolicy: + type: Local + - name: 3.6-ubi8 + annotations: + openshift.io/display-name: Python 3.6 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.6 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.6/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.6,python + version: '3.6' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/python-36:latest + referencePolicy: + type: Local + - name: 2.7-ubi8 + annotations: + openshift.io/display-name: Python 2.7 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 2.7 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/2.7/README.md. + iconClass: icon-python + tags: builder,python + supports: python:2.7,python + version: '2.7' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/python-27:latest + referencePolicy: + type: Local diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/tests/test-import-imagestream.yaml b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/tests/test-import-imagestream.yaml new file mode 100644 index 0000000000..398ee877a9 --- /dev/null +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/tests/test-import-imagestream.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ .Release.Name }}-connection-test" + namespace: "{{ .Release.Namespace }}" + annotations: + "helm.sh/hook": test +spec: + #serviceAccount: {{ .Values.serviceAccount }} + containers: + - name: "perl-imagestream-test" + image: "registry.access.redhat.com/ubi9/python-311" + imagePullPolicy: IfNotPresent + command: + - '/bin/bash' + - '-ec' + - > + python -v + lookupPolicy: + local: true + restartPolicy: Never \ No newline at end of file diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.schema.json b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.schema.json new file mode 100644 index 0000000000..9515e92364 --- /dev/null +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.schema.json @@ -0,0 +1,9 @@ +{ + "$schema": "http://json-schema.org/schema#", + "type": "object", + "properties": { + "namespace": { + "type": "string" + } + } +} \ No newline at end of file diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.yaml b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.yaml new file mode 100644 index 0000000000..3894ddbcae --- /dev/null +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/values.yaml @@ -0,0 +1 @@ +namespace: openshift From 0c1c18aa5fdc30e82c6738e0fd9f3cf31f5c2a13 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 5 Aug 2024 12:46:09 +0200 Subject: [PATCH 2/2] Update imagestreams, remove EOL and remove RHEL-7 Signed-off-by: Petr "Stone" Hracek --- .../0.0.2/src/Chart.yaml | 4 +- .../src/templates/python-imagestream.yaml | 96 +++++++------------ 2 files changed, 34 insertions(+), 66 deletions(-) diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml index 9b52da965b..616c2cd72f 100644 --- a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/Chart.yaml @@ -7,10 +7,10 @@ annotations: charts.openshift.io/provider: Red Hat charts.openshift.io/providerType: redhat apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: redhat-python-imagestreams tags: builder,python sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml index 3e2c84f6bd..d396cf6d52 100644 --- a/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml +++ b/charts/redhat/redhat/redhat-python-imagestreams/0.0.2/src/templates/python-imagestream.yaml @@ -24,6 +24,38 @@ spec: name: 3.9-ubi8 referencePolicy: type: Local + - name: 3.12-ubi9 + annotations: + openshift.io/display-name: Python 3.12 (UBI 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.12 applications on UBI 9. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.12,python + version: '3.12' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi9/python-312:latest + referencePolicy: + type: Local + - name: 3.12-ubi8 + annotations: + openshift.io/display-name: Python 3.12 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.12 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.12/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.12,python + version: '3.12' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/python-312:latest + referencePolicy: + type: Local - name: 3.11-ubi9 annotations: openshift.io/display-name: Python 3.11 (UBI 9) @@ -88,54 +120,6 @@ spec: name: registry.redhat.io/ubi8/python-39:latest referencePolicy: type: Local - - name: 3.8-ubi8 - annotations: - openshift.io/display-name: Python 3.8 (UBI 8) - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Python 3.8 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.8/README.md. - iconClass: icon-python - tags: builder,python - supports: python:3.8,python - version: '3.8' - sampleRepo: https://github.com/sclorg/django-ex.git - from: - kind: DockerImage - name: registry.redhat.io/ubi8/python-38:latest - referencePolicy: - type: Local - - name: 3.8-ubi7 - annotations: - openshift.io/display-name: Python 3.8 (UBI 7) - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Python 3.8 applications on UBI 7. For more information - about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md. - iconClass: icon-python - tags: builder,python - supports: python:3.8,python - version: '3.8' - sampleRepo: https://github.com/sclorg/django-ex.git - from: - kind: DockerImage - name: registry.redhat.io/ubi7/python-38:latest - referencePolicy: - type: Local - - name: '3.8' - annotations: - openshift.io/display-name: Python 3.8 - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Python 3.8 applications on RHEL 7. For more information - about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md. - iconClass: icon-python - tags: builder,python,hidden - supports: python:3.8,python - version: '3.8' - sampleRepo: https://github.com/sclorg/django-ex.git - from: - kind: DockerImage - name: registry.redhat.io/rhscl/python-38-rhel7:latest - referencePolicy: - type: Local - name: 3.6-ubi8 annotations: openshift.io/display-name: Python 3.6 (UBI 8) @@ -152,19 +136,3 @@ spec: name: registry.redhat.io/ubi8/python-36:latest referencePolicy: type: Local - - name: 2.7-ubi8 - annotations: - openshift.io/display-name: Python 2.7 (UBI 8) - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Python 2.7 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/2.7/README.md. - iconClass: icon-python - tags: builder,python - supports: python:2.7,python - version: '2.7' - sampleRepo: https://github.com/sclorg/django-ex.git - from: - kind: DockerImage - name: registry.redhat.io/ubi8/python-27:latest - referencePolicy: - type: Local