Skip to content

Commit

Permalink
redhat-dotnet-imagestreams: add .NET 9.0 images, remove EOL .NET 7 im…
Browse files Browse the repository at this point in the history
…ages. (#1653)
  • Loading branch information
tmds authored Nov 18, 2024
1 parent c1c0c87 commit 8592f99
Show file tree
Hide file tree
Showing 9 changed files with 236 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
description: |-
Build and run .NET applications on UBI.
For more information about using this builder image, including OpenShift considerations,
see https://github.com/redhat-developer/s2i-dotnetcore.
annotations:
charts.openshift.io/name: Red Hat .NET imagestreams.
charts.openshift.io/provider: Red Hat
charts.openshift.io/providerType: redhat
charts.openshift.io/supportURL: https://github.com/redhat-developer/s2i-dotnetcore
apiVersion: v2
appVersion: "9.0"
kubeVersion: '>=1.20.0'
name: redhat-dotnet-imagestreams
icon: data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDU2IiBoZWlnaHQ9IjQ1NiIgdmlld0JveD0iMCAwIDQ1NiA0NTYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSI0NTYiIGhlaWdodD0iNDU2IiBmaWxsPSIjNTEyQkQ0Ii8+CjxwYXRoIGQ9Ik04MS4yNzM4IDI5MS4zMzNDNzguMDQ5NiAyOTEuMzMzIDc1LjMwOSAyOTAuMjU5IDczLjA1MiAyODguMTFDNzAuNzk1IDI4NS45MDYgNjkuNjY2NSAyODMuMjg5IDY5LjY2NjUgMjgwLjI1OUM2OS42NjY1IDI3Ny4xNzMgNzAuNzk1IDI3NC41MjkgNzMuMDUyIDI3Mi4zMjVDNzUuMzA5IDI3MC4xMjEgNzguMDQ5NiAyNjkuMDE5IDgxLjI3MzggMjY5LjAxOUM4NC41NTE4IDI2OS4wMTkgODcuMzE5MyAyNzAuMTIxIDg5LjU3NjMgMjcyLjMyNUM5MS44ODcgMjc0LjUyOSA5My4wNDI0IDI3Ny4xNzMgOTMuMDQyNCAyODAuMjU5QzkzLjA0MjQgMjgzLjI4OSA5MS44ODcgMjg1LjkwNiA4OS41NzYzIDI4OC4xMUM4Ny4zMTkzIDI5MC4yNTkgODQuNTUxOCAyOTEuMzMzIDgxLjI3MzggMjkxLjMzM1oiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGQ9Ik0yMTAuMTY3IDI4OS41MTVIMTg5LjIwOUwxMzMuOTk0IDIwMi40MDZDMTMyLjU5NyAyMDAuMjAyIDEzMS40NDEgMTk3LjkxNSAxMzAuNTI4IDE5NS41NDZIMTMwLjA0NEMxMzAuNDc0IDE5OC4wODEgMTMwLjY4OSAyMDMuNTA4IDEzMC42ODkgMjExLjgyN1YyODkuNTE1SDExMi4xNDlWMTcxSDEzNC40NzdMMTg3LjgzOSAyNTYuMDQzQzE5MC4wOTYgMjU5LjU3IDE5MS41NDcgMjYxLjk5NCAxOTIuMTkyIDI2My4zMTZIMTkyLjUxNEMxOTEuOTc3IDI2MC4xNzYgMTkxLjcwOCAyNTQuODU5IDE5MS43MDggMjQ3LjM2NVYxNzFIMjEwLjE2N1YyODkuNTE1WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTMwMC40NDkgMjg5LjUxNUgyMzUuNTYxVjE3MUgyOTcuODdWMTg3LjY5NUgyNTQuNzQ2VjIyMS4yNDlIMjk0LjQ4NVYyMzcuODYxSDI1NC43NDZWMjcyLjkwM0gzMDAuNDQ5VjI4OS41MTVaIiBmaWxsPSJ3aGl0ZSIvPgo8cGF0aCBkPSJNMzkyLjY2NyAxODcuNjk1SDM1OS40NTdWMjg5LjUxNUgzNDAuMjcyVjE4Ny42OTVIMzA3LjE0M1YxNzFIMzkyLjY2N1YxODcuNjk1WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+Cg==
home: https://github.com/redhat-developer/s2i-dotnetcore
version: 0.0.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# .NET imagestream helm chart

A Helm chart for importing .NET 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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
latestversion: '9.0'
releases:
'9.0':
platform: 'UBI 8'
sdkdoc: 'https://github.com/redhat-developer/s2i-dotnetcore/tree/main/9.0/build/README.md'
sdkrepository: 'registry.access.redhat.com/ubi8/dotnet-90:9.0'
runtimedoc: 'https://github.com/redhat-developer/s2i-dotnetcore/tree/main/9.0/runtime/README.md'
runtimerepository: 'registry.access.redhat.com/ubi8/dotnet-90-runtime:9.0'
'8.0':
platform: 'UBI 8'
sdkdoc: 'https://github.com/redhat-developer/s2i-dotnetcore/tree/main/8.0/build/README.md'
sdkrepository: 'registry.access.redhat.com/ubi8/dotnet-80:8.0'
runtimedoc: 'https://github.com/redhat-developer/s2i-dotnetcore/tree/main/8.0/runtime/README.md'
runtimerepository: 'registry.access.redhat.com/ubi8/dotnet-80-runtime:8.0'
'6.0':
platform: 'UBI 8'
sdkdoc: 'https://github.com/redhat-developer/s2i-dotnetcore/tree/main/6.0/build/README.md'
sdkrepository: 'registry.access.redhat.com/ubi8/dotnet-60:6.0'
runtimedoc: 'https://github.com/redhat-developer/s2i-dotnetcore/tree/main/6.0/runtime/README.md'
runtimerepository: 'registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0'
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{{- define "platformTag" -}}
{{- $platform := . -}}
{{- $tag := $platform | replace " " "" | lower -}}
{{- $tag -}}
{{- end -}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{{- $data := fromYaml (.Files.Get "data.yaml") -}}
kind: ImageStream
apiVersion: image.openshift.io/v1
metadata:
name: dotnet
annotations:
openshift.io/display-name: .NET
spec:
tags:
{{- $latestversion := $data.latestversion }}
{{- $latest := index $data.releases $latestversion }}
- name: latest
annotations:
openshift.io/display-name: .NET (Latest)
openshift.io/provider-display-name: Red Hat, Inc.
description: |-
Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see {{ $latest.sdkdoc }}.
WARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major version updates.
iconClass: icon-dotnet
tags: builder,dotnet,hidden
supports: dotnet
sampleRepo: https://github.com/redhat-developer/s2i-dotnetcore-ex
sampleContextDir: app
sampleRef: dotnet-{{ $latestversion }}
from:
kind: ImageStreamTag
name: {{ $latestversion }}-{{ include "platformTag" $latest.platform }}
referencePolicy:
type: Local
{{- range $version, $info := $data.releases }}
- name: {{ $version }}-{{ include "platformTag" $info.platform }}
annotations:
openshift.io/display-name: .NET {{ $version }} ({{ $info.platform }})
openshift.io/provider-display-name: Red Hat, Inc.
description: Build and run .NET {{ $version }} applications on {{ $info.platform }}. For more information
about using this builder image, including OpenShift considerations, see {{ $info.sdkdoc }}.
iconClass: icon-dotnet
tags: builder,dotnet
version: '{{ $version }}'
supports: dotnet,dotnet:{{ $version }}
sampleRepo: https://github.com/redhat-developer/s2i-dotnetcore-ex
sampleContextDir: app
sampleRef: dotnet-{{ $version }}
from:
kind: DockerImage
name: {{ $info.sdkrepository }}
referencePolicy:
type: Local
- name: '{{ $version }}'
annotations:
openshift.io/display-name: .NET {{ $version }} ({{ $info.platform }})
openshift.io/provider-display-name: Red Hat, Inc.
description: Build and run .NET {{ $version }} applications on {{ $info.platform }}. For more information
about using this builder image, including OpenShift considerations, see {{ $info.sdkdoc }}.
iconClass: icon-dotnet
tags: builder,dotnet,hidden
version: '{{ $version }}'
supports: dotnet,dotnet:{{ $version }}
sampleRepo: https://github.com/redhat-developer/s2i-dotnetcore-ex
sampleContextDir: app
sampleRef: dotnet-{{ $version }}
from:
kind: DockerImage
name: {{ $info.sdkrepository }}
referencePolicy:
type: Local
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{{- $data := fromYaml (.Files.Get "data.yaml") -}}
kind: ImageStream
apiVersion: image.openshift.io/v1
metadata:
name: dotnet-runtime
annotations:
openshift.io/display-name: .NET Runtime
spec:
tags:
{{- $latestversion := $data.latestversion }}
{{- $latest := index $data.releases $latestversion }}
- name: latest
annotations:
openshift.io/display-name: .NET Runtime (Latest)
openshift.io/provider-display-name: Red Hat, Inc.
description: |-
Run .NET applications. For more information about using this image, including OpenShift considerations, see {{ $latest.runtimedoc }}.
WARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major version updates.
iconClass: icon-dotnet
tags: dotnet-runtime,hidden
supports: dotnet-runtime
from:
kind: ImageStreamTag
name: {{ $latestversion }}-{{ include "platformTag" $latest.platform }}
referencePolicy:
type: Local
{{- range $version, $info := $data.releases }}
- name: {{ $version }}-{{ include "platformTag" $info.platform }}
annotations:
openshift.io/display-name: .NET {{ $version }} Runtime ({{ $info.platform }})
openshift.io/provider-display-name: Red Hat, Inc.
description: Run .NET {{ $version }} applications on {{ $info.platform }}. For more information
about using this image, including OpenShift considerations, see {{ $info.runtimedoc }}.
iconClass: icon-dotnet
tags: dotnet-runtime
version: '{{ $version }}'
supports: dotnet-runtime,dotnet-runtime:{{ $version }}
from:
kind: DockerImage
name: {{ $info.runtimerepository }}
referencePolicy:
type: Local
- name: '{{ $version }}'
annotations:
openshift.io/display-name: .NET {{ $version }} Runtime ({{ $info.platform }})
openshift.io/provider-display-name: Red Hat, Inc.
description: Run .NET {{ $version }} applications on {{ $info.platform }}. For more information
about using this image, including OpenShift considerations, see {{ $info.runtimedoc }}.
iconClass: icon-dotnet
tags: dotnet-runtime,hidden
version: '{{ $version }}'
supports: dotnet-runtime,dotnet-runtime:{{ $version }}
from:
kind: DockerImage
name: {{ $info.runtimerepository }}
referencePolicy:
type: Local
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{{- $data := fromYaml (.Files.Get "data.yaml") -}}
apiVersion: v1
kind: Pod
metadata:
name: "{{ .Release.Name }}-imagestream-test"
namespace: "{{ .Release.Namespace }}"
annotations:
"helm.sh/hook": test
"alpha.image.policy.openshift.io/resolve-names": '*'
spec:
containers:
{{- $latestversion := $data.latestversion }}
- name: 'runtime-latest'
image: dotnet-runtime:latest
imagePullPolicy: IfNotPresent
command:
- '/bin/bash'
- '-ec'
- 'dotnet --list-runtimes | grep -F {{ $latestversion }}. && [[ -z $(dotnet --list-sdks) ]]'
- name: sdk-latest
image: dotnet:latest
imagePullPolicy: IfNotPresent
command:
- '/bin/bash'
- '-ec'
- 'dotnet --list-sdks | grep -F {{ $latestversion }}.'
{{- range $version, $info := $data.releases }}
- name: 'runtime-{{ $version | replace "." "" }}'
image: dotnet-runtime:{{ $version }}
imagePullPolicy: IfNotPresent
command:
- '/bin/bash'
- '-ec'
- 'dotnet --list-runtimes | grep -F {{ $version }}. && [[ -z $(dotnet --list-sdks) ]]'
- name: 'sdk-{{ $version | replace "." "" }}'
image: dotnet:{{ $version }}
imagePullPolicy: IfNotPresent
command:
- '/bin/bash'
- '-ec'
- 'dotnet --list-sdks | grep -F {{ $version }}.'
- name: 'runtime-{{ $version | replace "." "" }}-{{ include "platformTag" $info.platform }}'
image: dotnet-runtime:{{ $version }}-{{ include "platformTag" $info.platform }}
imagePullPolicy: IfNotPresent
command:
- '/bin/bash'
- '-ec'
- 'dotnet --list-runtimes | grep -F {{ $version }}. && [[ -z $(dotnet --list-sdks) ]]'
- name: 'sdk-{{ $version | replace "." "" }}-{{ include "platformTag" $info.platform }}'
image: dotnet:{{ $version }}-{{ include "platformTag" $info.platform }}
imagePullPolicy: IfNotPresent
command:
- '/bin/bash'
- '-ec'
- 'dotnet --list-sdks | grep -F {{ $version }}.'
{{- end }}
restartPolicy: Never
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "http://json-schema.org/schema#",
"type": "object"
}
Empty file.

0 comments on commit 8592f99

Please sign in to comment.