Set all image tags

It allows offline testing via xrally_kubernetes, k8s_vims, kube_bench
and kube_hunter.

Change-Id: I3084abec19f06a894d0083ecb3ed61882eddd785
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 8d748b9efc9ed4ed3edb4eaaf09909e41fe29577)

diff --git a/functest_kubernetes/ims/astaire-depl.yaml b/functest_kubernetes/ims/astaire-depl.yaml
index 0623729..2ceebfd 100644 (file)
--- a/functest_kubernetes/ims/astaire-depl.yaml
+++ b/functest_kubernetes/ims/astaire-depl.yaml
@@ -18,7 +18,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-astaire"
+      - image: "ollivier/clearwater-astaire:hunter"
         name: astaire
         ports:
         - containerPort: 22
@@ -47,7 +47,7 @@ spec:
           preStop:
             exec:
               command: ["/bin/bash", "-c", "/usr/bin/pre-stop"]
-      - image: busybox
+      - image: busybox:1.28
         name: tailer
         command: [ "tail", "-F", "/var/log/astaire/astaire_current.txt" ]
         volumeMounts:

diff --git a/functest_kubernetes/ims/bono-depl.yaml b/functest_kubernetes/ims/bono-depl.yaml
index fb79932..d850716 100644 (file)
--- a/functest_kubernetes/ims/bono-depl.yaml
+++ b/functest_kubernetes/ims/bono-depl.yaml
@@ -18,7 +18,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-bono"
+      - image: "ollivier/clearwater-bono:hunter"
         name: bono
         ports:
         - containerPort: 22
@@ -54,7 +54,7 @@ spec:
         volumeMounts:
         - name: bonologs
           mountPath: /var/log/bono
-      - image: busybox
+      - image: busybox:1.28
         name: tailer
         command: [ "tail", "-F", "/var/log/bono/bono_current.txt" ]
         volumeMounts:

diff --git a/functest_kubernetes/ims/cassandra-depl.yaml b/functest_kubernetes/ims/cassandra-depl.yaml
index 570ef4a..7758d9e 100644 (file)
--- a/functest_kubernetes/ims/cassandra-depl.yaml
+++ b/functest_kubernetes/ims/cassandra-depl.yaml
@@ -17,7 +17,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-cassandra"
+      - image: "ollivier/clearwater-cassandra:hunter"
         name: cassandra
         ports:
         - containerPort: 22

diff --git a/functest_kubernetes/ims/chronos-depl.yaml b/functest_kubernetes/ims/chronos-depl.yaml
index 1eb5501..5f753f1 100644 (file)
--- a/functest_kubernetes/ims/chronos-depl.yaml
+++ b/functest_kubernetes/ims/chronos-depl.yaml
@@ -20,7 +20,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-chronos"
+      - image: "ollivier/clearwater-chronos:hunter"
         name: chronos
         ports:
         - containerPort: 22
@@ -48,7 +48,7 @@ spec:
           preStop:
             exec:
               command: ["/bin/bash", "-c", "/usr/bin/pre-stop"]
-      - image: busybox
+      - image: busybox:1.28
         name: tailer
         command: [ "tail", "-F", "/var/log/chronos/chronos_current.txt" ]
         volumeMounts:

diff --git a/functest_kubernetes/ims/ellis-depl.yaml b/functest_kubernetes/ims/ellis-depl.yaml
index 2e6cedc..9403dbb 100644 (file)
--- a/functest_kubernetes/ims/ellis-depl.yaml
+++ b/functest_kubernetes/ims/ellis-depl.yaml
@@ -20,7 +20,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-ellis"
+      - image: "ollivier/clearwater-ellis:hunter"
         name: ellis
         ports:
         - containerPort: 22

diff --git a/functest_kubernetes/ims/homer-depl.yaml b/functest_kubernetes/ims/homer-depl.yaml
index 5690f1f..564b237 100644 (file)
--- a/functest_kubernetes/ims/homer-depl.yaml
+++ b/functest_kubernetes/ims/homer-depl.yaml
@@ -17,7 +17,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-homer"
+      - image: "ollivier/clearwater-homer:hunter"
         name: homer
         ports:
         - containerPort: 22

diff --git a/functest_kubernetes/ims/homestead-depl.yaml b/functest_kubernetes/ims/homestead-depl.yaml
index 8d38b7e..82ea0ce 100644 (file)
--- a/functest_kubernetes/ims/homestead-depl.yaml
+++ b/functest_kubernetes/ims/homestead-depl.yaml
@@ -21,7 +21,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup astaire; do echo waiting for astaire to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-homestead"
+      - image: "ollivier/clearwater-homestead:hunter"
         name: homestead
         ports:
         - containerPort: 22
@@ -44,7 +44,7 @@ spec:
         volumeMounts:
         - name: homesteadlogs
           mountPath: /var/log/homestead
-      - image: busybox
+      - image: busybox:1.28
         name: tailer
         command: [ "tail", "-F", "/var/log/homestead/homestead_current.txt" ]
         volumeMounts:

diff --git a/functest_kubernetes/ims/homestead-prov-depl.yaml b/functest_kubernetes/ims/homestead-prov-depl.yaml
index d8c7237..c194cea 100644 (file)
--- a/functest_kubernetes/ims/homestead-prov-depl.yaml
+++ b/functest_kubernetes/ims/homestead-prov-depl.yaml
@@ -18,7 +18,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup homestead; do echo waiting for homestead to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-homestead-prov"
+      - image: "ollivier/clearwater-homestead-prov:hunter"
         name: homestead-prov
         ports:
         - containerPort: 22

diff --git a/functest_kubernetes/ims/ims.py b/functest_kubernetes/ims/ims.py
index 780f9af..60cde88 100644 (file)
--- a/functest_kubernetes/ims/ims.py
+++ b/functest_kubernetes/ims/ims.py
@@ -34,7 +34,7 @@ class Vims(testcase.TestCase):  # pylint: disable=too-many-instance-attributes
     """
     watch_timeout = 1200
     metadata_name = "env-vars"
-    test_image_name = "ollivier/clearwater-live-test"
+    test_image_name = "ollivier/clearwater-live-test:hunter"
     test_container_name = "live-test"
 
     __logger = logging.getLogger(__name__)

diff --git a/functest_kubernetes/ims/ralf-depl.yaml b/functest_kubernetes/ims/ralf-depl.yaml
index 9dcf5fa..de2b93e 100644 (file)
--- a/functest_kubernetes/ims/ralf-depl.yaml
+++ b/functest_kubernetes/ims/ralf-depl.yaml
@@ -18,7 +18,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-ralf"
+      - image: "ollivier/clearwater-ralf:hunter"
         name: ralf
         ports:
         - containerPort: 22
@@ -41,7 +41,7 @@ spec:
         volumeMounts:
         - name: ralflogs
           mountPath: /var/log/ralf
-      - image: busybox
+      - image: busybox:1.28
         name: tailer
         command: [ "tail", "-F", "/var/log/ralf/ralf_current.txt" ]
         volumeMounts:

diff --git a/functest_kubernetes/ims/sprout-depl.yaml b/functest_kubernetes/ims/sprout-depl.yaml
index c3ce558..5e18248 100644 (file)
--- a/functest_kubernetes/ims/sprout-depl.yaml
+++ b/functest_kubernetes/ims/sprout-depl.yaml
@@ -24,7 +24,7 @@ spec:
           image: busybox:1.28
           command: ['sh', '-c', 'until nslookup homestead; do echo waiting for homestead to start ...; sleep 2; done']
       containers:
-      - image: "ollivier/clearwater-sprout"
+      - image: "ollivier/clearwater-sprout:hunter"
         name: sprout
         ports:
         - containerPort: 22
@@ -47,7 +47,7 @@ spec:
         volumeMounts:
         - name: sproutlogs
           mountPath: /var/log/sprout
-      - image: busybox
+      - image: busybox:1.28
         name: tailer
         command: [ "tail", "-F", "/var/log/sprout/sprout_current.txt" ]
         volumeMounts:

diff --git a/functest_kubernetes/rally/all-in-one.yaml b/functest_kubernetes/rally/all-in-one.yaml
index 2318fc2..03d016c 100644 (file)
--- a/functest_kubernetes/rally/all-in-one.yaml
+++ b/functest_kubernetes/rally/all-in-one.yaml
@@ -22,7 +22,7 @@ subtasks:
   - title: Run a single workload with create/read/delete pod
     scenario:
       Kubernetes.create_and_delete_pod:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
     runner:
       constant:
         concurrency: {{ concurrency }}
@@ -35,7 +35,7 @@ subtasks:
   - title: Run a single workload with create/read/delete replication controller
     scenario:
       Kubernetes.create_and_delete_replication_controller:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         replicas: 2
     runner:
       constant:
@@ -49,7 +49,7 @@ subtasks:
   - title: Run a single workload with create/scale/delete replication controller
     scenario:
       Kubernetes.create_scale_and_delete_replication_controller:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         replicas: 2
         scale_replicas: 3
     runner:
@@ -64,7 +64,7 @@ subtasks:
   - title: Run a single workload with create/read/delete replicaset
     scenario:
       Kubernetes.create_and_delete_replicaset:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         replicas: 1
     runner:
       constant:
@@ -78,7 +78,7 @@ subtasks:
   - title: Run a single workload with create/scale/delete replicaset
     scenario:
       Kubernetes.create_scale_and_delete_replicaset:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         replicas: 1
         scale_replicas: 2
     runner:
@@ -94,7 +94,7 @@ subtasks:
       Run a single workload with create/read/delete pod with emptyDir volume
     scenario:
       Kubernetes.create_and_delete_pod_with_emptydir_volume:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         mount_path: /opt/check
     runner:
       constant:
@@ -110,7 +110,7 @@ subtasks:
       volume
     scenario:
       Kubernetes.create_and_delete_pod_with_emptydir_volume:
-        image: busybox
+        image: busybox:1.28
         command:
           - sleep
           - "3600"
@@ -131,7 +131,7 @@ subtasks:
   - title: Run a single workload with create/read/delete pod with secret volume
     scenario:
       Kubernetes.create_and_delete_pod_with_secret_volume:
-        image: busybox
+        image: busybox:1.28
         command:
           - sleep
           - "3600"
@@ -148,7 +148,7 @@ subtasks:
   - title: Run a single workload with create/check/delete pod with secret volume
     scenario:
       Kubernetes.create_and_delete_pod_with_secret_volume:
-        image: busybox
+        image: busybox:1.28
         command:
           - sleep
           - "3600"
@@ -171,7 +171,7 @@ subtasks:
       volume
     scenario:
       Kubernetes.create_and_delete_pod_with_hostpath_volume:
-        image: busybox
+        image: busybox:1.28
         command:
           - sleep
           - "3600"
@@ -195,7 +195,7 @@ subtasks:
       Run a single workload with create/read/delete pod with configMap volume
     scenario:
       Kubernetes.create_and_delete_pod_with_configmap_volume:
-        image: busybox
+        image: busybox:1.28
         command:
           - "sleep"
           - "3600"
@@ -218,7 +218,7 @@ subtasks:
       volume
     scenario:
       Kubernetes.create_and_delete_pod_with_configmap_volume:
-        image: busybox
+        image: busybox:1.28
         command:
           - "sleep"
           - "3600"
@@ -243,7 +243,7 @@ subtasks:
   - title: Run a single workload with create/read/delete deployment
     scenario:
       Kubernetes.create_and_delete_deployment:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         replicas: 2
     runner:
       constant:
@@ -257,7 +257,7 @@ subtasks:
   - title: Run a single workload with create/rollout/delete deployment
     scenario:
       Kubernetes.create_rollout_and_delete_deployment:
-        image: busybox
+        image: busybox:1.28
         replicas: 1
         command:
           - sleep
@@ -281,7 +281,7 @@ subtasks:
   - title: Run a single workload with create/read/delete statefulset
     scenario:
       Kubernetes.create_and_delete_statefulset:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         replicas: 2
     runner:
       constant:
@@ -295,7 +295,7 @@ subtasks:
   - title: Run a single workload with create/scale/delete statefulset
     scenario:
       Kubernetes.create_scale_and_delete_statefulset:
-        image: kubernetes/pause
+        image: k8s.gcr.io/pause:3.3
         replicas: 1
         scale_replicas: 2
     runner:
@@ -310,7 +310,7 @@ subtasks:
   - title: Run a single workload with create/read/delete job
     scenario:
       Kubernetes.create_and_delete_job:
-        image: busybox
+        image: busybox:1.28
         command:
           - echo
           - "SUCCESS"