using configmap to store python executable, so that we don't need to …

…rebuild dockerimage if we change the tasks
GoogleCloudPlatform · Apr 4, 2018 · f6a97fc · f6a97fc
1 parent 80fceb6
commit f6a97fc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/docker-image/locust-tasks/tasks.py → config/tasks.py b/docker-image/locust-tasks/tasks.py → config/tasks.py
diff --git a/deploy.sh b/deploy.sh
@@ -9,4 +9,5 @@ fi
 sed -i "s/\$targetHost/http:\/\/${PROJECT_ID}.appspot.com/g;s/\$projectId/${PROJECT_ID}/g" kubernetes-config/locust-master-deployment.yaml
 sed -i "s/\$targetHost/http:\/\/${PROJECT_ID}.appspot.com/g;s/\$projectId/${PROJECT_ID}/g" kubernetes-config/locust-worker-deployment.yaml
 
+kubectl create configmap locust-tasks-configuration --from-file=tasks.py
 kubectl apply -f kubernetes-config
diff --git a/docker-image/locust-tasks/run.sh b/docker-image/locust-tasks/run.sh
@@ -16,7 +16,7 @@
 
 
 LOCUST="/usr/local/bin/locust"
-LOCUS_OPTS="-f /locust-tasks/tasks.py --host=$TARGET_HOST"
+LOCUS_OPTS="-f /locust-tasks/script/tasks.py --host=$TARGET_HOST"
 LOCUST_MODE=${LOCUST_MODE:-standalone}
 
 if [[ "$LOCUST_MODE" = "master" ]]; then

diff --git a/kubernetes-config/locust-master-deployment.yaml b/kubernetes-config/locust-master-deployment.yaml
@@ -51,4 +51,11 @@ spec:
               protocol: TCP
             - name: loc-master-p2
               containerPort: 5558
-              protocol: TCP
+              protocol: TCP
+          volumeMounts:
+            - name: locust-tasks-configuration
+              mountPath: /locust-tasks/script
+      volumes:
+        - name: locust-tasks-configuration
+          configMap:
+            name: locust-tasks-configuration
diff --git a/kubernetes-config/locust-worker-deployment.yaml b/kubernetes-config/locust-worker-deployment.yaml
@@ -43,4 +43,11 @@ spec:
             - name: LOCUST_MASTER
               value: locust-master
             - name: TARGET_HOST
-              value: $targetHost
+              value: $targetHost
+          volumeMounts:
+            - name: locust-tasks-configuration
+              mountPath: /locust-tasks/script
+      volumes:
+        - name: locust-tasks-configuration
+          configMap:
+            name: locust-tasks-configuration