Skip to content

Commit

Permalink
update version with ubi based tags
Browse files Browse the repository at this point in the history
this update all the clustertasks and the pipeline template
to use tags with ubi based images.

Signed-off-by: Pradeep Kumar <pradkuma@redhat.com>
  • Loading branch information
pradeepitm12 authored and tekton-robot committed Feb 25, 2021
1 parent 00191db commit d7d5587
Show file tree
Hide file tree
Showing 71 changed files with 80 additions and 81 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of .NET imagestream for .NET version
default: '3.1'
default: '3.1-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of .NET imagestream for .NET version
default: '3.1'
default: '3.1-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of .NET imagestream for .NET version
default: '3.1'
default: '3.1-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of .NET imagestream for .NET version
default: '3.1'
default: '3.1-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of java imagestream for java version
default: '11'
default: 'openjdk-11-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of java imagestream for java version
default: '11'
default: 'openjdk-11-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of java imagestream for java version
default: '11'
default: 'openjdk-11-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of java imagestream for java version
default: '11'
default: 'openjdk-11-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of nodejs imagestream for nodejs version
default: '12'
default: '12-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of nodejs imagestream for nodejs version
default: '12'
default: '12-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of nodejs imagestream for nodejs version
default: '12'
default: '12-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of nodejs imagestream for nodejs version
default: '12'
default: '12-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of perl imagestream for perl version
default: '5.30'
default: '5.30-el7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of perl imagestream for perl version
default: '5.30'
default: '5.30-el7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of perl imagestream for perl version
default: '5.30'
default: '5.30-el7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of perl imagestream for perl version
default: '5.30'
default: '5.30-el7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of php imagestream for php version
default: '7.3'
default: '7.3-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of php imagestream for php version
default: '7.3'
default: '7.3-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of php imagestream for php version
default: '7.3'
default: '7.3-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of php imagestream for php version
default: '7.3'
default: '7.3-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of python imagestream for python version
default: '3.8'
default: '3.8-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of python imagestream for python version
default: '3.8'
default: '3.8-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of python imagestream for python version
default: '3.8'
default: '3.8-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of python imagestream for python version
default: '3.8'
default: '3.8-ubi8'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of ruby imagestream for ruby version
default: '2.7'
default: '2.7-ubi7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of ruby imagestream for ruby version
default: '2.7'
default: '2.7-ubi7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of ruby imagestream for ruby version
default: '2.7'
default: '2.7-ubi7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
params:
- name: VERSION
description: The tag of ruby imagestream for ruby version
default: '2.7'
default: '2.7-ubi7'
type: string
- name: PATH_CONTEXT
description: The location of the path to run s2i from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ type pipeline struct {
}

type RuntimeSpec struct {
Runtime string
Version string
MinorVersion string
Default string
Runtime string
Version string
Default string
}

const (
Expand All @@ -50,14 +49,14 @@ const (

var (
Runtimes = map[string]RuntimeSpec{
"s2i-dotnet": {Runtime: "dotnet", Version: "$(params.VERSION)", Default: "3.1"},
"s2i-dotnet": {Runtime: "dotnet", Version: "$(params.VERSION)", Default: "3.1-ubi8"},
"s2i-go": {Runtime: "golang", Version: "$(params.VERSION)", Default: "1.13.4-ubi8"},
"s2i-java": {Runtime: "java", Version: "$(params.VERSION)", Default: "11"},
"s2i-nodejs": {Runtime: "nodejs", Version: "$(params.VERSION)", Default: "12"},
"s2i-perl": {Runtime: "perl", Version: "$(params.VERSION)", Default: "5.30"},
"s2i-php": {Runtime: "php", Version: "$(params.VERSION)", Default: "7.3"},
"s2i-python": {Runtime: "python", Version: "$(params.VERSION)", Default: "3.8"},
"s2i-ruby": {Runtime: "ruby", Version: "$(params.VERSION)", Default: "2.7"},
"s2i-java": {Runtime: "java", Version: "$(params.VERSION)", Default: "openjdk-11-ubi8"},
"s2i-nodejs": {Runtime: "nodejs", Version: "$(params.VERSION)", Default: "12-ubi8"},
"s2i-perl": {Runtime: "perl", Version: "$(params.VERSION)", Default: "5.30-el7"},
"s2i-php": {Runtime: "php", Version: "$(params.VERSION)", Default: "7.3-ubi8"},
"s2i-python": {Runtime: "python", Version: "$(params.VERSION)", Default: "3.8-ubi8"},
"s2i-ruby": {Runtime: "ruby", Version: "$(params.VERSION)", Default: "2.7-ubi7"},
"buildah": {},
}
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
Loading

0 comments on commit d7d5587

Please sign in to comment.