Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit 7be2b2d

Browse files
authored
Merge pull request #223 from triggermesh/mattray-patch-1
Spelling and grammar fixes
2 parents f4d6f35 + adff343 commit 7be2b2d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ tm deploy service foobar \
4343
--wait
4444
```
4545

46-
or deploy service straight from Go source using Openfaas runtime
46+
or deploy service straight from Go source using OpenFaaS runtime
4747
```
4848
tm deploy service bar \
4949
-f https://github.com/golang/example \
@@ -73,7 +73,7 @@ make test
7373

7474
## AWS Lambda
7575

76-
With triggermesh CLI you can easily deploy AWS Lambda functions on Kuberentes:
76+
With the TriggerMesh CLI you can easily deploy AWS Lambda functions on Kubernetes:
7777

7878
Prepare local source for Golang function
7979

@@ -103,7 +103,7 @@ func main() {
103103
EOF
104104
```
105105

106-
Deploy function using Go Knative lambda runtime
106+
Deploy function using Go Knative Lambda Runtime
107107

108108
```
109109
tm deploy service go-lambda -f . --runtime https://raw.githubusercontent.com/triggermesh/knative-lambda-runtime/master/go/runtime.yaml --wait
@@ -116,16 +116,16 @@ curl http://go-lambda.default.dev.triggermesh.io --data '{"Name": "Foo"}'
116116
"Hello Foo!"
117117
```
118118

119-
[Here](https://github.com/triggermesh/knative-lambda-runtime) you can find more information about Knative lambda runtimes
119+
[Here](https://github.com/triggermesh/knative-lambda-runtime) you can find more information about Knative Lambda Runtimes
120120

121121

122122
## Deployment pipelines
123123

124124
_This feature is only available for Github.com repositories at the moment_
125125

126-
With Triggermesh CLI you can create fully functional deployment pipeline of existing git repository with a single command. In example below we're assuming that you have an access to k8s cluster with knative and tekton pipelines installed. If you use Triggermesh cloud you should not worry about requirements; platform is ready to go.
126+
With TriggerMesh CLI you can create fully functional deployment pipeline of existing git repository with a single command. In example below we're assuming that you have an access to Kubernetes cluster with Knative and Tekton pipelines installed. If you use TriggerMesh Cloud you should not worry about requirements; platform is ready to go.
127127

128-
As a first step, you should create new public repository in Github.com which we will use in our example. After the empty repository has been created, we need to push sample AWS Lambda project to it:
128+
As a first step, you should create new public repository in GitHub.com which we will use in our example. After the empty repository has been created, we need to push sample AWS Lambda project to it:
129129

130130
```
131131
tm generate python foo
@@ -142,21 +142,21 @@ Now that we have repository with Python project, let's create build pipeline:
142142
```
143143
tm push | kubectl apply -f -
144144
```
145-
-this command creates several knative and tekton components:
145+
-this command creates several Knative and Tekton components:
146146

147147
1. Tekton task with `tm` image to build AWS Lambda project using [KLR](https://github.com/triggermesh/knative-lambda-runtime)
148148
1. Tekton taskrun to initiate project build and corresponding pipelineresource with source URL
149-
1. Triggermesh Github custom "third-party" containersource that allows to track events on Github repositories*
150-
1. Triggermesh Aktion [transceiver](https://github.com/triggermesh/aktion/tree/master/cmd/transceiver) and its configmap to create new taskruns on incoming events from Github containersource
149+
1. TriggerMesh GitHub custom "third-party" containersource that allows to track events on GitHub repositories*
150+
1. TriggerMesh Aktion [transceiver](https://github.com/triggermesh/aktion/tree/master/cmd/transceiver) and its configmap to create new taskruns on incoming events from GitHub containersource
151151

152152

153-
\* our Github containersource is aimed at simplifying event tracking and based on periodic Github API requests (one request per minute). As a result, you don't need to create and store any tokens. Downside of this approach is that containersource have requests rate limitation (60 requests per hour) and it doesn't work with private repositories. Both of these limitation can be bypassed by providing Github personal access token in push command parameter: `tm push --token <TOKEN>`
153+
\* our GitHub containersource is aimed at simplifying event tracking and based on periodic GitHub API requests (one request per minute). As a result, you don't need to create and store any tokens. Downside of this approach is that containersource have requests rate limitation (60 requests per hour) and it doesn't work with private repositories. Both of these limitations can be bypassed by providing GitHub personal access token in push command parameter: `tm push --token <TOKEN>`
154154

155155
After few minutes you should be able to see new Knative service deployed in cluster. Any commits will trigger new build and deploy so that new function will reflect all code changes.
156156

157157
### Docker registry
158158

159-
Docker images are used to run functions code in Knative services. This means that image registry is important part of service deployment scheme. Depending on type of service, Knative controller may either only pull or also push service image from and to registry. Triggermesh CLI provides simple configuration interface to setup registry address and user access credentials.
159+
Docker images are used to run functions code in Knative services. This means that image registry is important part of service deployment scheme. Depending on type of service, Knative controller may either only pull or also push service image from and to registry. TriggerMesh CLI provides simple configuration interface to setup registry address and user access credentials.
160160

161161
#### Service from pre-build image
162162

@@ -174,7 +174,7 @@ If pre-built image stored in **private** registry, you must specify access crede
174174
tm set registry-auth foo-registry
175175
```
176176

177-
You will be asked to enter registry address, username and password - they will saved to k8s secret and used to pull images deployed under you service account.
177+
You will be asked to enter a registry address, username, and password - they will be saved to k8s secret and be used to pull images deployed under your service account.
178178

179179
Besides pulling, this secret may be used to push new images for service deployment based on function source code and build template. Name of one particular k8s secret should be passed to deployment command to make CLI work with private registry:
180180

@@ -191,7 +191,7 @@ If user whose credentials are specified in `foo-registry` have "write" permissio
191191

192192
#### Gitlab CI registry
193193

194-
Triggermesh CLI can be used as deployment step in Gitlab CI pipeline, but considering [tokens](https://docs.gitlab.com/ee/user/project/deploy_tokens/) security policy, user must manually create CI deployment token as described [here](https://docs.gitlab.com/ee/user/project/deploy_tokens/#gitlab-deploy-token).
194+
TriggerMesh CLI can be used as deployment step in GitLab CI pipeline, but considering [tokens](https://docs.gitlab.com/ee/user/project/deploy_tokens/) security policy, user must manually create CI deployment token as described [here](https://docs.gitlab.com/ee/user/project/deploy_tokens/#gitlab-deploy-token).
195195
Deployment token must have registry read permission and should be valid for as long as the service expected to be active. If token is created, `tm` deployment step must include following commands:
196196

197197
```
@@ -202,11 +202,11 @@ script:
202202
...
203203
```
204204
After this, you may pass `--registry-secret gitlab-registry` parameter to `tm deploy` command (or in [serverless.yml](https://gitlab.com/knative-examples/functions/blob/master/serverless.yaml#L6)) so that Knative could authenticate against Gitlab registry.
205-
Gitlab registry doesn't provide permanent read-write token that can be used in CI, but it has job-specific `CI_JOB_TOKEN` with "write" permission which is valid only while CI job running and `CI_DEPLOY_PASSWORD` with read permission which we created before. Considering this, we can see that CLI `set registry-auth` command supports `--push` and `--pull` flags that indicates which secret must be used to push image and which for "pull" operations only. Resulting images will be stored under `registry.gitlab.com/username/project/function_name` path
205+
GitLab registry doesn't provide permanent read-write token that can be used in CI, but it has job-specific `CI_JOB_TOKEN` with "write" permission which is valid only while CI job running and `CI_DEPLOY_PASSWORD` with read permission which we created before. Considering this, we can see that CLI `set registry-auth` command supports `--push` and `--pull` flags that indicates which secret must be used to push image and which for "pull" operations only. Resulting images will be stored under `registry.gitlab.com/username/project/function_name` path
206206

207207
### Custom registry name
208208

209-
While using a username as a registry identifier (docker.io/username) is a common practice, in some cases we must be able to use different values for an authentication and in destination URL (for example, [gcr.io](https://cloud.google.com/container-registry/docs/advanced-authentication#linux-macos)). Triggermesh CLI `set registry-auth` command provides such ability by exposing an optional `--project` argument which will be used as a part of the image URL instead of the username:
209+
While using a username as a registry identifier (docker.io/username) is a common practice, in some cases we must be able to use different values for an authentication and in destination URL (for example, [gcr.io](https://cloud.google.com/container-registry/docs/advanced-authentication#linux-macos)). TriggerMesh CLI `set registry-auth` command provides such ability by exposing an optional `--project` argument which will be used as a part of the image URL instead of the username:
210210

211211
```
212212
TOKEN=$(gcloud auth print-access-token)
@@ -221,7 +221,7 @@ As a result, Knative service image will be pushed to `eu.gcr.io/my-org/my-projec
221221

222222
ECR is a specific case of the custom registry destination with an additional requirement - a repository must be created before pushing the image. Thus, service deployment steps should be slightly altered:
223223

224-
1. Create ECR repository in `<project>/<service>` format where "project" is an arbitrary identifier for the service (e.g. namespace) and "service" is the name of the service that is being deployed (in the example below it is `python-test`).
224+
1. Create ECR repository in `<project>/<service>` format where "project" is an arbitrary identifier for the service (e.g., namespace) and "service" is the name of the service that is being deployed (in the example below it is `python-test`).
225225
1. Retrieve ECR token:
226226
```
227227
TOKEN=$(aws ecr get-login-password --region <region>)
@@ -243,7 +243,7 @@ ECR is a specific case of the custom registry destination with an additional req
243243
244244
#### Unauthenticated registry
245245
246-
Besides hosted registries, triggermesh CLI may work with unauthenticated registries which does not require setting access credentials. For such cases, you may simply add `--registry-host` argument to deployment command with registry domain name parameter and resulting image will be pushed to `registry-host/namespace/service_name` URL
246+
Besides hosted registries, the TriggerMesh CLI may work with unauthenticated registries which do not require setting access credentials. For such cases, you may simply add `--registry-host` argument to the deployment command with registry domain name parameter and the resulting image will be pushed to `registry-host/namespace/service_name` URL
247247
248248
### How-To
249249

0 commit comments

Comments
 (0)