From 33fbe9956127234a4ef41c409374befebc1e1f9a Mon Sep 17 00:00:00 2001 From: Alex Wong Date: Tue, 12 Mar 2019 14:35:39 +0800 Subject: [PATCH] remove logCmdOutput from docs and k8s resources definition --- charts/loadtester/README.md | 4 +--- charts/loadtester/templates/deployment.yaml | 1 - charts/loadtester/values.yaml | 1 - docs/gitbook/how-it-works.md | 6 ++++-- docs/gitbook/install/flagger-install-on-kubernetes.md | 1 - 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/charts/loadtester/README.md b/charts/loadtester/README.md index ebea4ef9..d696f62e 100644 --- a/charts/loadtester/README.md +++ b/charts/loadtester/README.md @@ -56,15 +56,13 @@ Parameter | Description | Default `nodeSelector` | node labels for pod assignment | `{}` `service.type` | type of service | `ClusterIP` `service.port` | ClusterIP port | `80` -`cmd.logOutput` | Log the command output to stderr | `true` `cmd.timeout` | Command execution timeout | `1h` `logLevel` | Log level can be debug, info, warning, error or panic | `info` Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```console -helm install flagger/loadtester --name flagger-loadtester \ ---set cmd.logOutput=false +helm install flagger/loadtester --name flagger-loadtester ``` Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, diff --git a/charts/loadtester/templates/deployment.yaml b/charts/loadtester/templates/deployment.yaml index 997ffe87..49c5d99c 100644 --- a/charts/loadtester/templates/deployment.yaml +++ b/charts/loadtester/templates/deployment.yaml @@ -29,7 +29,6 @@ spec: - -port=8080 - -log-level={{ .Values.logLevel }} - -timeout={{ .Values.cmd.timeout }} - - -log-cmd-output={{ .Values.cmd.logOutput }} livenessProbe: exec: command: diff --git a/charts/loadtester/values.yaml b/charts/loadtester/values.yaml index b68834c5..b28b45ef 100644 --- a/charts/loadtester/values.yaml +++ b/charts/loadtester/values.yaml @@ -7,7 +7,6 @@ image: logLevel: info cmd: - logOutput: true timeout: 1h nameOverride: "" diff --git a/docs/gitbook/how-it-works.md b/docs/gitbook/how-it-works.md index cf69fec6..317ae262 100644 --- a/docs/gitbook/how-it-works.md +++ b/docs/gitbook/how-it-works.md @@ -519,7 +519,6 @@ helm repo add flagger https://flagger.app helm upgrade -i flagger-loadtester flagger/loadtester \ --namespace=test \ ---set cmd.logOutput=true \ --set cmd.timeout=1h ``` @@ -533,11 +532,13 @@ webhooks: url: http://flagger-loadtester.test/ timeout: 5s metadata: + type: cmd cmd: "hey -z 1m -q 10 -c 2 http://podinfo.test:9898/" - name: load-test-post url: http://flagger-loadtester.test/ timeout: 5s metadata: + type: cmd cmd: "hey -z 1m -q 10 -c 2 -m POST -d '{test: 2}' http://podinfo.test:9898/echo" ``` @@ -554,6 +555,7 @@ webhooks: url: http://flagger-loadtester.test/ timeout: 5s metadata: + type: cmd cmd: "hey -z 1m -q 10 -c 2 -h2 https://podinfo.example.com/" ``` @@ -565,4 +567,4 @@ FROM quay.io/stefanprodan/flagger-loadtester: RUN curl -Lo /usr/local/bin/my-cli https://github.com/user/repo/releases/download/ver/my-cli \ && chmod +x /usr/local/bin/my-cli -``` +``` \ No newline at end of file diff --git a/docs/gitbook/install/flagger-install-on-kubernetes.md b/docs/gitbook/install/flagger-install-on-kubernetes.md index ebd33a73..865c4f9d 100644 --- a/docs/gitbook/install/flagger-install-on-kubernetes.md +++ b/docs/gitbook/install/flagger-install-on-kubernetes.md @@ -126,7 +126,6 @@ Deploy the load test runner with Helm: ```bash helm upgrade -i flagger-loadtester flagger/loadtester \ --namespace=test \ ---set cmd.logOutput=true \ --set cmd.timeout=1h ```