Skip to content

Commit 36cfeba

Browse files
committed
Address comments.
1 parent f0cfb9b commit 36cfeba

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

test/cluster/keytar/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
# Keytar
22

3-
Keytar is an internally used Vitess system for continuous execution of cluster
4-
tests on Kubernetes/Google Cloud. It monitors docker images on [Docker Hub](https://hub.docker.com). When a new image is uploaded to Docker Hub, Keytar starts a cluster on Google Compute Engine (GKE) and runs Kubernetes applications for the purpose of executing cluster tests. It exposes a simple web status page showing test results.
3+
Keytar is an internally used Vitess system for continuous execution of cluster tests on Kubernetes/Google Cloud. It monitors docker images on [Docker Hub](https://hub.docker.com). When a new image is uploaded to Docker Hub, Keytar starts a cluster on Google Compute Engine (GKE) and runs Kubernetes applications for the purpose of executing cluster tests. It will then locally run tests against the cluster. It exposes a simple web status page showing test results.
54

65
## Setup
76

87
How to set up Keytar for Vitess:
98

109
* Create service account keys with GKE credentials on the account to run the tests on. Follow [step 1 from the GKE developers page](https://developers.google.com/identity/protocols/application-default-credentials?hl=en_US#howtheywork).
1110
* Move the generated keyfile to `$VTTOP/test/cluster/keytar/config`.
12-
* Create or modify the test configuration file (`$VTTOP/test/cluster/keytar/config/vitess_p0_config.yaml`).
11+
* Create or modify the test configuration file (`$VTTOP/test/cluster/keytar/config/vitess_config.yaml`).
1312
* Ensure the configuration has the correct values for GKE project name and keyfile:
1413
```
1514
cluster_setup:
@@ -20,7 +19,7 @@ How to set up Keytar for Vitess:
2019
* Then run the following commands:
2120
```
2221
> cd $VTTOP/test/cluster/keytar
23-
> KEYTAR_PASSWORD=<desired password> KEYTAR_PORT=<desired port, default 8080> KEYTAR_CONFIG=<desired configuration, default vitess_p0_config.yaml> ./keytar-up.sh
22+
> KEYTAR_PASSWORD=<desired password> KEYTAR_PORT=<desired port, default 8080> KEYTAR_CONFIG=<desired configuration, default vitess_config.yaml> ./keytar-up.sh
2423
```
2524
* Add a Docker Hub webhook pointing to the Keytar service. The webhook URL should be in the form:
2625
```

test/cluster/keytar/keytar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def __init__(self):
186186
self.worker_thread.daemon = True
187187

188188
def worker_loop(self):
189-
# Run forever, executing tests as they are added to the queue
189+
# Run forever, executing tests as they are added to the queue.
190190
while True:
191191
item = self.test_queue.get()
192192
run_test_config(item)

0 commit comments

Comments
 (0)