aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--functest_kubernetes/ims/astaire-depl.yaml4
-rw-r--r--functest_kubernetes/ims/bono-depl.yaml4
-rw-r--r--functest_kubernetes/ims/cassandra-depl.yaml2
-rw-r--r--functest_kubernetes/ims/chronos-depl.yaml4
-rw-r--r--functest_kubernetes/ims/ellis-depl.yaml2
-rw-r--r--functest_kubernetes/ims/homer-depl.yaml2
-rw-r--r--functest_kubernetes/ims/homestead-depl.yaml4
-rw-r--r--functest_kubernetes/ims/homestead-prov-depl.yaml2
-rw-r--r--functest_kubernetes/ims/ims.py2
-rw-r--r--functest_kubernetes/ims/ralf-depl.yaml4
-rw-r--r--functest_kubernetes/ims/sprout-depl.yaml4
-rw-r--r--functest_kubernetes/rally/all-in-one.yaml34
-rw-r--r--functest_kubernetes/security/kube-bench.yaml2
-rw-r--r--functest_kubernetes/security/kube-hunter.yaml4
14 files changed, 37 insertions, 37 deletions
diff --git a/functest_kubernetes/ims/astaire-depl.yaml b/functest_kubernetes/ims/astaire-depl.yaml
index 06237293..2ceebfde 100644
--- 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 fb799322..d8507165 100644
--- 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 570ef4a3..7758d9ef 100644
--- 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 1eb55016..5f753f1f 100644
--- 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 2e6cedc7..9403dbbe 100644
--- 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 5690f1f2..564b2374 100644
--- 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 8d38b7e8..82ea0cef 100644
--- 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 d8c72371..c194cea9 100644
--- 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 51eb42d6..ee9d6935 100644
--- 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 9dcf5faa..de2b93ec 100644
--- 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 c3ce558a..5e182483 100644
--- 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 2318fc22..03d016ca 100644
--- 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"
diff --git a/functest_kubernetes/security/kube-bench.yaml b/functest_kubernetes/security/kube-bench.yaml
index 714af1bc..38a2ef60 100644
--- a/functest_kubernetes/security/kube-bench.yaml
+++ b/functest_kubernetes/security/kube-bench.yaml
@@ -12,7 +12,7 @@ spec:
hostPID: true
containers:
- name: kube-bench
- image: aquasec/kube-bench
+ image: aquasec/kube-bench:0.3.1
command: ["kube-bench"]
volumeMounts:
- name: var-lib-etcd
diff --git a/functest_kubernetes/security/kube-hunter.yaml b/functest_kubernetes/security/kube-hunter.yaml
index f6200163..e5a81ed3 100644
--- a/functest_kubernetes/security/kube-hunter.yaml
+++ b/functest_kubernetes/security/kube-hunter.yaml
@@ -7,8 +7,8 @@ spec:
spec:
containers:
- name: kube-hunter
- image: aquasec/kube-hunter
- command: ["kube-hunter"]
+ image: aquasec/kube-hunter:0.3.1
+ command: ["python", "kube-hunter.py"]
args: ["--pod"]
restartPolicy: Never
backoffLimit: 4