This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-website.git
The following commit(s) were added to refs/heads/master by this push:
new 65b0b3c fix: convert resources into manifests to be consistent (#191)
65b0b3c is described below
commit 65b0b3c2e04a06d355ec5a526a419ce016ddcee5
Author: Humbertzhang <[email protected]>
AuthorDate: Sat Jan 2 16:18:15 2021 +0800
fix: convert resources into manifests to be consistent (#191)
---
content/blog/e2e-design/index.md | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/content/blog/e2e-design/index.md b/content/blog/e2e-design/index.md
index 576f53d..7ab511a 100644
--- a/content/blog/e2e-design/index.md
+++ b/content/blog/e2e-design/index.md
@@ -44,13 +44,13 @@ This will run the test case in the specified directory,
this command is a wrappe
```shell
e2e setup --env=compose --file=docker-compose.yaml --wait-for=service/health
-e2e setup --env=kind --file=kind.yaml --resources=bookinfo.yaml,gateway.yaml
--wait-for=pod/ready
+e2e setup --env=kind --file=kind.yaml --manifests=bookinfo.yaml,gateway.yaml
--wait-for=pod/ready
e2e setup # If configuration file e2e.yaml is present
```
-
+
- `--env`: the environment, may be `compose` or `kind`, represents
docker-compose and KinD respectively;
- `--file`: the `docker-compose.yaml` or `kind.yaml` file that declares how to
set up the environment;
-- `--resources`: for KinD, the resources files/directories to apply (using
`kubectl apply -f`);
+- `--manifests`: for KinD, the resources files/directories to apply (using
`kubectl apply -f`);
- `--command`: a command to run after the environment is started, this may be
useful when users need to install some extra tools or apply resources from
command line, like `istioctl install --profile=demo`;
- `--wait-for`: can be specified multiple times to give a list of conditions
to be met; wait until the given conditions are met; the most frequently-used
strategy should be `--wait-for=service/health`,
`--wait-for=deployments/available`, etc. that make the `e2e setup` command to
wait for all conditions to be met; other possible strategies may be something
like `--wait-for="log:Started Successfully"`,
`--wait-for="http:localhost:8080/healthcheck"`, etc. if really needed;
@@ -89,6 +89,7 @@ e2e verify # If configuration file e2e.yaml is present
- `--actual`: the actual data file, only YAML file format is supported;
- `--expected`: the expected data file, only YAML file format is supported;
- `--query`: the query to get the actual data, the query result must have the
same format as `--actual` and `--expected`;
+
> The `--query` option will get the output into a temporary file and use the
`--actual` under the hood;
