Minor improvements to the test infrastructure (kubeflow#16)

* Add some missing steps to the instructions * Delete the in cluster NFS server since we have switched to external NFS. * Remove the NFS + Jupyter component; we don't really use this; it has been replaced by the debug worker.
Linchin · Feb 10, 2018 · 762b2a3 · 762b2a3
1 parent 92b4e8a
commit 762b2a3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -224,6 +224,12 @@ gcloud --project=${PROJECT} container clusters create \
 ```
 
 
+### Create a static ip for the Argo UI
+
+```
+gcloud compute --project=mlkube-testing addresses create argo-ui --global
+```
+
 ### Create a GCP service account
 
 * The tests need a GCP service account to upload data to GCS for Gubernator
@@ -239,11 +245,11 @@ gcloud projects add-iam-policy-binding ${PROJECT} \
 Create a secret key containing a GCP private key for the service account
 
 ```
-gcloud iam service-accounts keys create ~/tmp/key.json \
+KEY_FILE=<path to key>
+gcloud iam service-accounts keys create ${KEY_FILE} \
     	--iam-account ${SERVICE_ACCOUNT}@${PROJECT}.iam.gserviceaccount.com
 kubectl create secret generic kubeflow-testing-credentials \
-    --namespace=kubeflow-test-infra --from-file=`echo ~/tmp/key.json`
-rm ~/tmp/key.json
+    --namespace=kubeflow-test-infra --from-file=key.json=${KEY_FILE}
 ```
 
 Make the service account a cluster admin
@@ -276,7 +282,7 @@ You can use the GitHub API to create a token
 To create the secret run
 
 ```
-kubectl create secret generic github-token --namespace=kubeflow-test-infra --from-literal=github_token=${TOKEN}
+kubectl create secret generic github-token --namespace=kubeflow-test-infra --from-literal=github_token=${GITHUB_TOKEN}
 ```
 
 ### Deploy NFS
@@ -286,18 +292,6 @@ We use GCP Cloud Launcher to create a single node NFS share; current settings
   * 8 VCPU
   * 1 TB disk
 
-### Create a PD for NFS
-
-**Note** We are in the process of migrating to using an NFS share outside the GKE cluster. Once we move
-kubeflow/kubeflow to that we can get rid of this section.
-
-Create a PD to act as the backing storage for the NFS filesystem that will be used to store data from
-the test runs.
-
-```
-  gcloud --project=${PROJECT} compute disks create  \
-  	--zone=${ZONE} kubeflow-testing --description="PD to back NFS storage for kubeflow testing." --size=1TB
-```
 ### Create K8s Resources for Testing
 
 The ksonnet app `test-infra` contains ksonnet configs to deploy the test infrastructure.
@@ -323,15 +317,6 @@ Create the PVs corresponding to external NFS
 ks apply prow -c nfs-external
 ```
 
-Deploy NFS & Jupyter
-
-```
-ks apply prow -c nfs-jupyter
-```
-
-* This creates the NFS share
-* We use JupyterHub as a convenient way to access the NFS share for manual inspection of the file contents.
-
 #### Troubleshooting
 
 User or service account deploying the test infrastructure needs sufficient permissions to create the roles that are created as part deploying the test infrastructure. So you may need to run the following command before using ksonnet to deploy the test infrastructure.

diff --git a/test-infra/components/debug-worker.jsonnet b/test-infra/components/debug-worker.jsonnet
@@ -44,13 +44,9 @@ local ss = {
                 "image": "gcr.io/mlkube-testing/test-worker:latest", 
                 "name": "test-container", 
                 "volumeMounts": [
-                  {
-                    "mountPath": "/mnt/data", 
-                    "name": "nfs-external"
-                  }, 
                   {
                     "mountPath": "/mnt/test-data-volume", 
-                    "name": "kubeflow-test-volume"
+                    "name": "nfs-external"
                   }, 
                   {
                     "mountPath": "/secret/gcp-credentials", 
@@ -66,12 +62,6 @@ local ss = {
                   "claimName": "nfs-external"
                 }
               }, 
-              {
-                "name": "kubeflow-test-volume", 
-                "persistentVolumeClaim": {
-                  "claimName": "kubeflow-testing"
-                }
-              }, 
               {
                 "name": "gcp-credentials", 
                 "secret": {

diff --git a/test-infra/components/nfs-jupyter.jsonnet b/test-infra/components/nfs-jupyter.jsonnet
diff --git a/test-infra/components/params.libsonnet b/test-infra/components/params.libsonnet
@@ -9,13 +9,6 @@
     argo: {
       namespace: "kubeflow-test-infra",
     },
-    "nfs-jupyter": {
-      cloud: "",
-      disks: "kubeflow-testing",
-      name: "nfs-jupyter",
-      namespace: "kubeflow-test-infra",
-      tfJobImage: "gcr.io/tf-on-k8s-dogfood/tf_operator:v20171214-0bd02ac",
-    },
     "nfs-external": {
       name: "nfs-external",
       namespace: "kubeflow-test-infra",