Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change CRI endpoints environment variable #258

Merged
merged 1 commit into from
Feb 27, 2018
Merged

Change CRI endpoints environment variable #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/crictl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ func main() {
},
cli.StringFlag{
Name: "runtime-endpoint, r",
EnvVar: "CRI_RUNTIME_ENDPOINT",
EnvVar: "CONTAINER_RUNTIME_ENDPOINT",
Value: "unix:///var/run/dockershim.sock",
Usage: "Endpoint of CRI container runtime service",
},
cli.StringFlag{
Name: "image-endpoint, i",
EnvVar: "CRI_IMAGE_ENDPOINT",
EnvVar: "IMAGE_SERVICE_ENDPOINT",
Usage: "Endpoint of CRI image manager service",
},
cli.DurationFlag{
Expand Down
4 changes: 2 additions & 2 deletions cmd/critest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ func main() {
},
cli.StringFlag{
Name: "runtime-endpoint, r",
EnvVar: "CRI_RUNTIME_ENDPOINT",
EnvVar: "CONTAINER_RUNTIME_ENDPOINT",
Value: "unix:///var/run/dockershim.sock",
Usage: "CRI runtime service address which is tested.",
},
cli.StringFlag{
Name: "image-endpoint, i",
EnvVar: "CRI_IMAGE_ENDPOINT",
EnvVar: "IMAGE_SERVICE_ENDPOINT",
Usage: "CRI image service address which is tested. Same with runtime-address if not specified.",
},
cli.StringFlag{
Expand Down
2 changes: 1 addition & 1 deletion docs/benchmark.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This will
critest connects to `unix:///var/run/dockershim.sock` by default. For other runtimes, the endpoint can be set in two ways:

- By setting flags `--runtime-endpoint` and `--image-endpoint`
- By setting environment variables `CRI_RUNTIME_ENDPOINT` and `CRI_IMAGE_ENDPOINT`
- By setting environment variables `CONTAINER_RUNTIME_ENDPOINT` and `IMAGE_SERVICE_ENDPOINT`

## Additional options

Expand Down
2 changes: 1 addition & 1 deletion docs/crictl.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Subcommands includes:
crictl connects to `unix:///var/run/dockershim.sock` by default. For other runtimes, the endpoint can be set in three ways:

- By setting flags `--runtime-endpoint` and `--image-endpoint`
- By setting environment variables `CRI_RUNTIME_ENDPOINT` and `CRI_IMAGE_ENDPOINT`
- By setting environment variables `CONTAINER_RUNTIME_ENDPOINT` and `IMAGE_SERVICE_ENDPOINT`
- By setting the endpoint in the config file `--config=/etc/crictl.yaml`

```
Expand Down
2 changes: 1 addition & 1 deletion docs/validation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ This will
critest connects to `unix:///var/run/dockershim.sock` by default. For other runtimes, the endpoint can be set in two ways:

- By setting flags `--runtime-endpoint` and `--image-endpoint`
- By setting environment variables `CRI_RUNTIME_ENDPOINT` and `CRI_IMAGE_ENDPOINT`
- By setting environment variables `CONTAINER_RUNTIME_ENDPOINT` and `IMAGE_SERVICE_ENDPOINT`

## Additional options

Expand Down