Skip to content

Commit

Permalink
Fix s2i builder images for disconnected cluster by using imagestreams
Browse files Browse the repository at this point in the history
  • Loading branch information
savitaashture authored and openshift-merge-bot[bot] committed Jun 18, 2024
1 parent 0f6751b commit 7d4419a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ apiVersion: v2
name: task-containers
description: Contains the Tekton Tasks to manage container images
type: application
version: 0.3.1
version: 0.3.2
7 changes: 6 additions & 1 deletion templates/spec-s2i.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ params:
type: string
description: |
Fully qualified container image name to be built by s2i.
- name: VERSION
description: The tag of go imagestream for go version
default: latest
type: string
- name: IMAGE_SCRIPTS_URL
type: string
default: image:///usr/libexec/s2i
Expand All @@ -45,6 +49,7 @@ stepTemplate:
env:
{{- $variables := list
"params.IMAGE"
"params.VERSION"
"params.IMAGE_SCRIPTS_URL"
"params.CONTEXT"
"params.FORMAT"
Expand All @@ -71,7 +76,7 @@ steps:
workingDir: $(workspaces.source.path)
env:
- name: S2I_BUILDER_IMAGE
value: {{ $s2iBuilderImage }}
value: "{{ $s2iBuilderImage }}:$(params.VERSION)"
command:
- /scripts/s2i-generate.sh
args:
Expand Down
16 changes: 8 additions & 8 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ images:
# source-to-image builder images, each language represents a distinct ecosystem the builder supports,
# sometimes it includes a specific version
s2iBuilders:
python: registry.access.redhat.com/ubi8/python-39:latest
ruby: registry.access.redhat.com/ubi9/ruby-31:1-102
perl: registry.access.redhat.com/ubi9/perl-532:1-145
go: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5.1713833129
nodejs: registry.access.redhat.com/ubi8/nodejs-18:latest
php: registry.access.redhat.com/ubi9/php-81:1-54
dotnet: registry.access.redhat.com/ubi8/dotnet-60:6.0-48
java: registry.access.redhat.com/ubi8/openjdk-11:latest
python: image-registry.openshift-image-registry.svc:5000/openshift/python
ruby: image-registry.openshift-image-registry.svc:5000/openshift/ruby
perl: image-registry.openshift-image-registry.svc:5000/openshift/perl
go: image-registry.openshift-image-registry.svc:5000/openshift/golang
nodejs: image-registry.openshift-image-registry.svc:5000/openshift/nodejs
php: image-registry.openshift-image-registry.svc:5000/openshift/php
dotnet: image-registry.openshift-image-registry.svc:5000/openshift/dotnet
java: image-registry.openshift-image-registry.svc:5000/openshift/java

annotations:
tekton.dev/pipelines.minVersion: "0.41.0"
Expand Down

0 comments on commit 7d4419a

Please sign in to comment.