fix test fixtures and adapt test to counter method

tumblr · Jan 29, 2019 · 74f453f · 74f453f
1 parent 16d79fe
commit 74f453f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/test/fixtures/k8s/configmap-volume-mounts.yaml b/test/fixtures/k8s/configmap-volume-mounts.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: test-injectionconfig-vms
+  name: test-volume-mounts
   namespace: default
 data:
   test-tumblr1: |
@@ -16,7 +16,7 @@ data:
       - name: FROM_INJECTOR
         value: bar
     containers:
-    - name: sidecar-nginx
+    - name: sidecar-add-vm
       image: nginx:1.12.2
       imagePullPolicy: IfNotPresent
       env:
@@ -27,13 +27,18 @@ data:
       volumeMounts:
         - name: nginx-conf
           mountPath: /etc/nginx
-    - name: another-sidecar
+    - name: sidecar-existing-vm
       image: foo:69
       ports:
         - containerPort: 420
       volumeMounts:
         - name: test-vol
           mountPath: /tmp/another-dir
+    - name: sidecar-first-vm  
+      image: bar:42
+      imagePullPolicy: always
+      ports:
+        - containerPort: 43    
     volumes:
     - name: nginx-conf
       configMap:

diff --git a/test/fixtures/sidecars/volume-mounts.yaml b/test/fixtures/sidecars/volume-mounts.yaml
@@ -1,12 +1,14 @@
----
 name: volume-mounts
+volumeMounts:
+  - name: test-vol
+    mountPath: /tmp/test
 env:
   - name: DATACENTER
     value: foo
   - name: FROM_INJECTOR
     value: bar
 containers:
-- name: sidecar-nginx
+- name: sidecar-add-vm
   image: nginx:1.12.2
   imagePullPolicy: IfNotPresent
   env:
@@ -17,19 +19,22 @@ containers:
   volumeMounts:
     - name: nginx-conf
       mountPath: /etc/nginx
-    - name: test-vol
-      mountPath: /tmp/test
-- name: another-sidecar
+- name: sidecar-existing-vm
   image: foo:69
   ports:
     - containerPort: 420
   volumeMounts:
     - name: test-vol
       mountPath: /tmp/another-dir
+- name: sidecar-first-vm  
+  image: bar:42
+  imagePullPolicy: always
+  ports:
+    - containerPort: 43    
 volumes:
 - name: nginx-conf
   configMap:
     name: nginx-configmap
 - name: test-vol
   configMap:
-    name: test-config
+    name: test-config