diff --git a/Dockerfile b/Dockerfile index e63517e58..081dc013a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,10 @@ -FROM quay.io/operator-framework/ansible-operator:v1.9.0 +FROM quay.io/operator-framework/ansible-operator:v1.32.0 USER root COPY requirements.yml ${HOME}/requirements.yml +RUN python3 -m pip install jmespath +RUN ansible-galaxy collection install community.general +RUN ansible-galaxy collection list RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \ && chmod -R ug+rwx ${HOME}/.ansible diff --git a/playbooks/benchmark.yml b/playbooks/benchmark.yml index e4366aa44..b60b2b8ab 100644 --- a/playbooks/benchmark.yml +++ b/playbooks/benchmark.yml @@ -22,7 +22,7 @@ when: workload.args.drop_cache_kernel is defined - name: Capture operator information - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: "{{ operator_namespace }}" diff --git a/requirements.yml b/requirements.yml index 3f626ed2f..8c8123ba9 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,6 +1,6 @@ --- collections: - name: community.kubernetes - version: "1.2.1" + version: "2.0.1" - name: operator_sdk.util - version: "0.2.0" + version: "0.5.0" diff --git a/roles/backpack/tasks/main.yml b/roles/backpack/tasks/main.yml index 40f2f1177..02e1248ce 100644 --- a/roles/backpack/tasks/main.yml +++ b/roles/backpack/tasks/main.yml @@ -10,7 +10,7 @@ when: benchmark_state.resources[0].status.state is not defined - name: Get benchmark state - k8s_facts: + k8s_info: api_version: ripsaw.cloudbulldozer.io/v1alpha1 kind: Benchmark name: "{{ ansible_operator_meta.name }}" @@ -18,7 +18,7 @@ register: benchmark_state - name: Get DaemonSet state - k8s_facts: + k8s_info: api_version: apps/v1 kind: DaemonSet name: "backpack-{{ trunc_uuid }}" @@ -36,7 +36,7 @@ definition: "{{ lookup('template', 'backpack.yml') | from_yaml }}" - name: Get DaemonSet Status - k8s_facts: + k8s_info: api_version: apps/v1 kind: DaemonSet name: "backpack-{{ trunc_uuid }}" @@ -52,7 +52,7 @@ - block: - name: Get initial pod list - k8s_facts: + k8s_info: kind: Pod namespace: "{{ operator_namespace }}" label_selectors: @@ -82,7 +82,7 @@ when: workload.name != "backpack" - name: Get benchmark state - k8s_facts: + k8s_info: api_version: ripsaw.cloudbulldozer.io/v1alpha1 kind: Benchmark name: "{{ ansible_operator_meta.name }}" diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 1270b776c..13f88b3c0 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,7 +1,7 @@ # common tasks across multiple roles go here - block: - name: Get Network Policy - k8s_facts: + k8s_info: kind: NetworkPolicy api_version: networking.k8s.io/v1 namespace: '{{ operator_namespace }}' diff --git a/roles/fio_distributed/tasks/main.yml b/roles/fio_distributed/tasks/main.yml index b26e5fd3a..db63d2195 100644 --- a/roles/fio_distributed/tasks/main.yml +++ b/roles/fio_distributed/tasks/main.yml @@ -152,7 +152,7 @@ - block: - name: wait for db creation job to finish - k8s_facts: + k8s_info: kind: Job api_version: batch/v1 name: 'fio-prefill-{{ trunc_uuid }}' diff --git a/roles/hammerdb/tasks/main.yaml b/roles/hammerdb/tasks/main.yaml index 91ebf3ceb..f5a1f07f3 100644 --- a/roles/hammerdb/tasks/main.yaml +++ b/roles/hammerdb/tasks/main.yaml @@ -196,7 +196,7 @@ - block: - block: - name: wait for db creation job to finish - k8s_facts: + k8s_info: kind: Job api_version: batch/v1 name: '{{ ansible_operator_meta.name }}-creator-{{ trunc_uuid }}' diff --git a/roles/kernel_cache_drop/tasks/main.yml b/roles/kernel_cache_drop/tasks/main.yml index de1a3a94f..8b0ef4180 100644 --- a/roles/kernel_cache_drop/tasks/main.yml +++ b/roles/kernel_cache_drop/tasks/main.yml @@ -10,7 +10,7 @@ shell: "python3 /opt/ansible/roles/kernel_cache_drop/wait_for_daemonset.py 30 {{ operator_namespace }} kernel-cache-dropper" - name: get kernel cache dropper pods - k8s_facts: + k8s_info: kind: Pod label_selectors: - name = kernel-cache-dropper diff --git a/roles/nighthawk/tasks/main.yml b/roles/nighthawk/tasks/main.yml index 040bb1d83..29a02cc67 100644 --- a/roles/nighthawk/tasks/main.yml +++ b/roles/nighthawk/tasks/main.yml @@ -26,7 +26,7 @@ - block: - name: Get server pods - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -46,7 +46,7 @@ - block: - name: Get server pod info - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -55,7 +55,7 @@ register: server_pods - name: Get route info - k8s_facts: + k8s_info: kind: Route api_version: route.openshift.io/v1 namespace: '{{ operator_namespace }}' @@ -86,7 +86,7 @@ - block: - name: Get client pod status - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -129,7 +129,7 @@ - block: - block: - name: Waiting for pods to complete.... - k8s_facts: + k8s_info: kind: pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -157,7 +157,7 @@ - block: - name: Get Server Jobs - k8s_facts: + k8s_info: kind: Job api_version: v1 namespace: '{{ operator_namespace }}' @@ -166,7 +166,7 @@ register: server_jobs - name: Get Server Pods - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/pgbench/tasks/run_workload.yml b/roles/pgbench/tasks/run_workload.yml index 7b183a69c..05c9698a3 100644 --- a/roles/pgbench/tasks/run_workload.yml +++ b/roles/pgbench/tasks/run_workload.yml @@ -3,7 +3,7 @@ command: "redis-cli set pgb_start true" - name: Check for pods to complete - k8s_facts: + k8s_info: kind: pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/testpmd/tasks/main.yml b/roles/testpmd/tasks/main.yml index ba190e76c..af96c95d4 100644 --- a/roles/testpmd/tasks/main.yml +++ b/roles/testpmd/tasks/main.yml @@ -36,7 +36,7 @@ - block: - name: Wait for pods to be running.... - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -65,7 +65,7 @@ - block: - name: Get TestPMD pod info - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -89,7 +89,7 @@ - block: - name: Wait for pods to be running.... - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf-scale/tasks/cleanup.yml b/roles/uperf-scale/tasks/cleanup.yml index 34359a1a4..4be469fc2 100644 --- a/roles/uperf-scale/tasks/cleanup.yml +++ b/roles/uperf-scale/tasks/cleanup.yml @@ -4,7 +4,7 @@ ### kind # Cleanup servers, but leave clients around mostly for further examining of results. - name: Get Server Jobs - k8s_facts: + k8s_info: kind: Job api_version: v1 namespace: '{{ operator_namespace }}' @@ -13,7 +13,7 @@ register: server_jobs - name: Get Server Pods - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf-scale/tasks/setup.yml b/roles/uperf-scale/tasks/setup.yml index 455b798d6..6b8d29513 100644 --- a/roles/uperf-scale/tasks/setup.yml +++ b/roles/uperf-scale/tasks/setup.yml @@ -69,7 +69,7 @@ num_server_pods: "{{ (node_hi_idx|int+1) * (pod_hi_idx|int+1) }}" - name: Capture ServiceIP - k8s_facts: + k8s_info: kind: Service api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf-scale/tasks/start_client.yml b/roles/uperf-scale/tasks/start_client.yml index ae620066b..2794df285 100644 --- a/roles/uperf-scale/tasks/start_client.yml +++ b/roles/uperf-scale/tasks/start_client.yml @@ -1,7 +1,7 @@ --- - name: Get pod info - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf-scale/tasks/start_server.yml b/roles/uperf-scale/tasks/start_server.yml index fbc4325e9..440e4989c 100644 --- a/roles/uperf-scale/tasks/start_server.yml +++ b/roles/uperf-scale/tasks/start_server.yml @@ -39,7 +39,7 @@ # to derive its affinity according the 'colocate' variable # - name: Wait for pods to be running.... - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf-scale/tasks/wait_client_done.yml b/roles/uperf-scale/tasks/wait_client_done.yml index dacbb97b6..c3f8cec57 100644 --- a/roles/uperf-scale/tasks/wait_client_done.yml +++ b/roles/uperf-scale/tasks/wait_client_done.yml @@ -2,7 +2,7 @@ - block: ### kind - name: Waiting for pods to complete.... - k8s_facts: + k8s_info: kind: pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf-scale/tasks/wait_client_ready.yml b/roles/uperf-scale/tasks/wait_client_ready.yml index 672d0d8b7..b9afe2099 100644 --- a/roles/uperf-scale/tasks/wait_client_ready.yml +++ b/roles/uperf-scale/tasks/wait_client_ready.yml @@ -4,7 +4,7 @@ ### kind - name: Get client pod status - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf-scale/tasks/wait_server_ready.yml b/roles/uperf-scale/tasks/wait_server_ready.yml index ca0324744..6006a9561 100644 --- a/roles/uperf-scale/tasks/wait_server_ready.yml +++ b/roles/uperf-scale/tasks/wait_server_ready.yml @@ -3,7 +3,7 @@ ### kind - name: Get server pods - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/uperf/tasks/main.yml b/roles/uperf/tasks/main.yml index 798a9470b..0c530c6e6 100644 --- a/roles/uperf/tasks/main.yml +++ b/roles/uperf/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Capture ServiceIP - k8s_facts: + k8s_info: kind: Service api_version: v1 namespace: '{{ operator_namespace }}' @@ -62,7 +62,7 @@ - block: - name: Get server pods - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -83,7 +83,7 @@ - block: - name: Wait for vms to be running.... - k8s_facts: + k8s_info: kind: VirtualMachineInstance api_version: kubevirt.io/v1alpha3 namespace: '{{ operator_namespace }}' @@ -108,7 +108,7 @@ - block: - name: Get pod info - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -153,7 +153,7 @@ - block: - name: Wait for vms to be running.... - k8s_facts: + k8s_info: kind: VirtualMachineInstance api_version: kubevirt.io/v1alpha3 namespace: '{{ operator_namespace }}' @@ -187,7 +187,7 @@ - block: - name: Get client pod status - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -218,7 +218,7 @@ command: "redis-cli set complete-{{ trunc_uuid }} false" - name: Get client vm status - k8s_facts: + k8s_info: kind: VirtualMachineInstance api_version: kubevirt.io/v1alpha3 namespace: '{{ operator_namespace }}' @@ -253,7 +253,7 @@ - block: - block: - name: Waiting for pods to complete.... - k8s_facts: + k8s_info: kind: pod api_version: v1 namespace: '{{ operator_namespace }}' @@ -295,7 +295,7 @@ - block: - name: Get Server Jobs - k8s_facts: + k8s_info: kind: Job api_version: v1 namespace: '{{ operator_namespace }}' @@ -304,7 +304,7 @@ register: server_jobs - name: Get Server Pods - k8s_facts: + k8s_info: kind: Pod api_version: v1 namespace: '{{ operator_namespace }}' diff --git a/roles/ycsb/tasks/main.yml b/roles/ycsb/tasks/main.yml index cbbe1ac17..85aba2c6b 100644 --- a/roles/ycsb/tasks/main.yml +++ b/roles/ycsb/tasks/main.yml @@ -37,7 +37,7 @@ ycsb_workload_load: "workloada" - name: Wait for Load Job to Succeed... - k8s_facts: + k8s_info: kind: Job api_version: batch/v1 name: 'ycsb-data-load-job-{{ ycsb_workload_load }}-{{ trunc_uuid }}' @@ -108,7 +108,7 @@ ycsb_workload: "{{ workload_args.workloads[wrkload.stdout|int] }}" - name: Wait for YCSB Workload Job to Succeed... - k8s_facts: + k8s_info: kind: Job api_version: batch/v1 name: 'ycsb-bench-job-{{ ycsb_workload }}-{{ trunc_uuid }}'