From dc834bed9777a5ca172f2bdf5311b6d54ad2104d Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 3 Feb 2025 13:52:11 +0100 Subject: [PATCH 1/2] Copy 0.0.2 -> 0.0.3 Signed-off-by: Petr "Stone" Hracek --- .../0.0.3/src/Chart.yaml | 14 ++ .../0.0.3/src/README.md | 7 + .../0.0.3/src/templates/php-imagestream.yaml | 122 ++++++++++++++++++ .../tests/test-import-imagestream.yaml | 21 +++ .../0.0.3/src/values.schema.json | 9 ++ .../0.0.3/src/values.yaml | 1 + 6 files changed, 174 insertions(+) create mode 100644 charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml create mode 100644 charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/README.md create mode 100644 charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml create mode 100644 charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/tests/test-import-imagestream.yaml create mode 100644 charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/values.schema.json create mode 100644 charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/values.yaml diff --git a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml new file mode 100644 index 0000000000..414cd1d569 --- /dev/null +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml @@ -0,0 +1,14 @@ +description: |- + This content is experimental, do not use it in production. Import PHP imagestreams to OpenShift 4. + For more information about using this builder image, including OpenShift considerations, + see https://github.com/sclorg/s2i-php-container/blob/master/8.2/README.md. +annotations: + charts.openshift.io/name: Red Hat PHP imagestreams on UBI (experimental) +apiVersion: v2 +appVersion: 0.0.2 +kubeVersion: '>=1.20.0' +name: redhat-php-imagestreams +tags: builder,php +sources: + - https://github.com/sclorg/helm-charts +version: 0.0.2 diff --git a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/README.md b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/README.md new file mode 100644 index 0000000000..0cea533a04 --- /dev/null +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/README.md @@ -0,0 +1,7 @@ +# PHP imagestreams helm chart + +A Helm chart for importing PHP 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-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml new file mode 100644 index 0000000000..2522de7cd4 --- /dev/null +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml @@ -0,0 +1,122 @@ +--- +kind: ImageStream +apiVersion: image.openshift.io/v1 +metadata: + name: php + annotations: + openshift.io/display-name: PHP +spec: + tags: + - name: latest + annotations: + openshift.io/display-name: PHP (Latest) + openshift.io/provider-display-name: Red Hat, Inc. + description: |- + Build and run PHP applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md. + + WARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major version updates. + iconClass: icon-php + tags: builder,php + supports: php + sampleRepo: https://github.com/sclorg/cakephp-ex.git + from: + kind: ImageStreamTag + name: 8.2-ubi8 + referencePolicy: + type: Local + - name: 8.2-ubi9 + annotations: + openshift.io/display-name: PHP 8.2 (UBI 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run PHP 8.2 applications on UBI 9. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.2/README.md. + iconClass: icon-php + tags: builder,php + supports: php:8.2,php + version: '8.2' + sampleRepo: https://github.com/sclorg/cakephp-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi9/php-82:latest + referencePolicy: + type: Local + - name: 8.2-ubi8 + annotations: + openshift.io/display-name: PHP 8.2 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run PHP 8.2 applications on UBI 8. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.2/README.md. + iconClass: icon-php + tags: builder,php + supports: php:8.2,php + version: '8.2' + sampleRepo: https://github.com/sclorg/cakephp-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/php-82:latest + referencePolicy: + type: Local + - name: 8.1-ubi9 + annotations: + openshift.io/display-name: PHP 8.1 (UBI 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run PHP 8.1 applications on UBI 9. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md. + iconClass: icon-php + tags: builder,php + supports: php:8.1,php + version: '8.1' + sampleRepo: https://github.com/sclorg/cakephp-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi9/php-81:latest + referencePolicy: + type: Local + - name: 8.0-ubi9 + annotations: + openshift.io/display-name: PHP 8.0 (UBI 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run PHP 8.0 applications on UBI 9. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md. + iconClass: icon-php + tags: builder,php + supports: php:8.0,php + version: '8.0' + sampleRepo: https://github.com/sclorg/cakephp-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi9/php-80:latest + referencePolicy: + type: Local + - name: 8.0-ubi8 + annotations: + openshift.io/display-name: PHP 8.0 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run PHP 8.0 applications on UBI 8. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md. + iconClass: icon-php + tags: builder,php + supports: php:8.0,php + version: '8.0' + sampleRepo: https://github.com/sclorg/cakephp-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/php-80:latest + referencePolicy: + type: Local + - name: 7.4-ubi8 + annotations: + openshift.io/display-name: PHP 7.4 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run PHP 7.4 applications on UBI 8. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.4/README.md. + iconClass: icon-php + tags: builder,php + supports: php:7.4,php + version: '7.4' + sampleRepo: https://github.com/sclorg/cakephp-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest + referencePolicy: + type: Local diff --git a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/tests/test-import-imagestream.yaml b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/tests/test-import-imagestream.yaml new file mode 100644 index 0000000000..579b5befc3 --- /dev/null +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/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: "php-imagestream-test" + image: "registry.access.redhat.com/ubi9/php-81" + imagePullPolicy: IfNotPresent + command: + - '/bin/bash' + - '-ec' + - > + php -v + lookupPolicy: + local: true + restartPolicy: Never diff --git a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/values.schema.json b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/values.schema.json new file mode 100644 index 0000000000..9515e92364 --- /dev/null +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/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-php-imagestreams/0.0.3/src/values.yaml b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/values.yaml new file mode 100644 index 0000000000..3894ddbcae --- /dev/null +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/values.yaml @@ -0,0 +1 @@ +namespace: openshift From b3327d9d0f1d1fff67abaf46ecb7591b189df7ff Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 3 Feb 2025 13:54:35 +0100 Subject: [PATCH 2/2] PHP 8.0 has reached EOL in Nov 2024. Let's remove it from Helms Signed-off-by: Petr "Stone" Hracek --- .../redhat-php-imagestreams/0.0.3/src/Chart.yaml | 4 ++-- .../0.0.3/src/templates/php-imagestream.yaml | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml index 414cd1d569..2e772d8733 100644 --- a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat PHP imagestreams on UBI (experimental) apiVersion: v2 -appVersion: 0.0.2 +appVersion: 0.0.3 kubeVersion: '>=1.20.0' name: redhat-php-imagestreams tags: builder,php sources: - https://github.com/sclorg/helm-charts -version: 0.0.2 +version: 0.0.3 diff --git a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml index 2522de7cd4..56e181a511 100644 --- a/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml +++ b/charts/redhat/redhat/redhat-php-imagestreams/0.0.3/src/templates/php-imagestream.yaml @@ -88,22 +88,6 @@ spec: name: registry.redhat.io/ubi9/php-80:latest referencePolicy: type: Local - - name: 8.0-ubi8 - annotations: - openshift.io/display-name: PHP 8.0 (UBI 8) - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run PHP 8.0 applications on UBI 8. For more information - about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md. - iconClass: icon-php - tags: builder,php - supports: php:8.0,php - version: '8.0' - sampleRepo: https://github.com/sclorg/cakephp-ex.git - from: - kind: DockerImage - name: registry.redhat.io/ubi8/php-80:latest - referencePolicy: - type: Local - name: 7.4-ubi8 annotations: openshift.io/display-name: PHP 7.4 (UBI 8)