Skip to content

Commit

Permalink
Update knative deploy task
Browse files Browse the repository at this point in the history
  • Loading branch information
@savitaashture @tekton-robot
savitaashture authored and tekton-robot committed May 6, 2021
1 parent a335db4 commit 9413de9
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ func kubernetesDeployTask(deployTask map[string]interface{}) map[string]interfac
}

func knativeDeployTask(deployTask map[string]interface{}) map[string]interface{} {
deployTask["name"] = "kn-service-create"
deployTask["name"] = "kn-service-apply"
deployTask["taskRef"] = map[string]interface{}{"name": "kn", "kind": "ClusterTask"}
deployTask["runAfter"] = []interface{}{"build"}
deployTask["params"] = []interface{}{
map[string]interface{}{"name": "ARGS", "value": []interface{}{"service", "create", "$(params.APP_NAME)", "--image=$(params.IMAGE_NAME)", "--force"}},
map[string]interface{}{"name": "ARGS", "value": []interface{}{"service", "apply", "$(params.APP_NAME)", "--image=$(params.IMAGE_NAME)"}},
}
return deployTask
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-knative.golden
View file
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/strategy":"docker","pipeline.openshift.io/type":"knative"},"name":"buildah-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"}],"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":"CONTEXT","value":"$(params.PATH_CONTEXT)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"buildah"},"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/strategy":"docker","pipeline.openshift.io/type":"knative"},"name":"buildah-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"}],"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":"CONTEXT","value":"$(params.PATH_CONTEXT)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"buildah"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-apply","params":[{"name":"ARGS","value":["service","apply","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
2 changes: 1 addition & 1 deletion pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative.golden
View file
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-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"}]}}
{"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-apply","params":[{"name":"ARGS","value":["service","apply","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
2 changes: 1 addition & 1 deletion pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative.golden
View file
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":"golang","pipeline.openshift.io/type":"knative"},"name":"s2i-go-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":"1.14.7-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-go"},"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":"golang","pipeline.openshift.io/type":"knative"},"name":"s2i-go-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":"1.14.7-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-go"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-apply","params":[{"name":"ARGS","value":["service","apply","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
2 changes: 1 addition & 1 deletion pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative.golden
View file
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":"java","pipeline.openshift.io/type":"knative"},"name":"s2i-java-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":"openjdk-11-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-java"},"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":"java","pipeline.openshift.io/type":"knative"},"name":"s2i-java-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":"openjdk-11-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-java"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-apply","params":[{"name":"ARGS","value":["service","apply","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
2 changes: 1 addition & 1 deletion pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden
View file
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":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-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":"14-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-nodejs"},"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":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-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":"14-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-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-apply","params":[{"name":"ARGS","value":["service","apply","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
2 changes: 1 addition & 1 deletion pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden
View file
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":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-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":"5.30-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-perl"},"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":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-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":"5.30-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-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-apply","params":[{"name":"ARGS","value":["service","apply","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
Loading

0 comments on commit 9413de9

Please # to comment.