Skip to content

Commit 576ee97

Browse files
Joe TalericoRussell Zaleski
Joe Talerico
authored and
Russell Zaleski
committed
Fixing BMO for CNV
CNV w/ OpenShift 4.15 was broken. This should fix it. Signed-off-by: Joe Talerico <[email protected]>
1 parent 081359d commit 576ee97

File tree

20 files changed

+47
-44
lines changed

20 files changed

+47
-44
lines changed

‎Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
FROM quay.io/operator-framework/ansible-operator:v1.9.0
1+
FROM quay.io/operator-framework/ansible-operator:v1.32.0
22
USER root
33

44
COPY requirements.yml ${HOME}/requirements.yml
5+
RUN python3 -m pip install jmespath
6+
RUN ansible-galaxy collection install community.general
7+
RUN ansible-galaxy collection list
58
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
69
&& chmod -R ug+rwx ${HOME}/.ansible
710

‎playbooks/benchmark.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
when: workload.args.drop_cache_kernel is defined
2323

2424
- name: Capture operator information
25-
k8s_facts:
25+
k8s_info:
2626
kind: Pod
2727
api_version: v1
2828
namespace: "{{ operator_namespace }}"

‎requirements.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
collections:
33
- name: community.kubernetes
4-
version: "1.2.1"
4+
version: "2.0.1"
55
- name: operator_sdk.util
6-
version: "0.2.0"
6+
version: "0.5.0"

‎roles/backpack/tasks/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
when: benchmark_state.resources[0].status.state is not defined
1111

1212
- name: Get benchmark state
13-
k8s_facts:
13+
k8s_info:
1414
api_version: ripsaw.cloudbulldozer.io/v1alpha1
1515
kind: Benchmark
1616
name: "{{ ansible_operator_meta.name }}"
1717
namespace: "{{ operator_namespace }}"
1818
register: benchmark_state
1919

2020
- name: Get DaemonSet state
21-
k8s_facts:
21+
k8s_info:
2222
api_version: apps/v1
2323
kind: DaemonSet
2424
name: "backpack-{{ trunc_uuid }}"
@@ -36,7 +36,7 @@
3636
definition: "{{ lookup('template', 'backpack.yml') | from_yaml }}"
3737

3838
- name: Get DaemonSet Status
39-
k8s_facts:
39+
k8s_info:
4040
api_version: apps/v1
4141
kind: DaemonSet
4242
name: "backpack-{{ trunc_uuid }}"
@@ -52,7 +52,7 @@
5252
- block:
5353

5454
- name: Get initial pod list
55-
k8s_facts:
55+
k8s_info:
5656
kind: Pod
5757
namespace: "{{ operator_namespace }}"
5858
label_selectors:
@@ -82,7 +82,7 @@
8282
when: workload.name != "backpack"
8383

8484
- name: Get benchmark state
85-
k8s_facts:
85+
k8s_info:
8686
api_version: ripsaw.cloudbulldozer.io/v1alpha1
8787
kind: Benchmark
8888
name: "{{ ansible_operator_meta.name }}"

‎roles/common/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# common tasks across multiple roles go here
22
- block:
33
- name: Get Network Policy
4-
k8s_facts:
4+
k8s_info:
55
kind: NetworkPolicy
66
api_version: networking.k8s.io/v1
77
namespace: '{{ operator_namespace }}'

‎roles/fio_distributed/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152

153153
- block:
154154
- name: wait for db creation job to finish
155-
k8s_facts:
155+
k8s_info:
156156
kind: Job
157157
api_version: batch/v1
158158
name: 'fio-prefill-{{ trunc_uuid }}'

‎roles/hammerdb/tasks/main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
- block:
197197
- block:
198198
- name: wait for db creation job to finish
199-
k8s_facts:
199+
k8s_info:
200200
kind: Job
201201
api_version: batch/v1
202202
name: '{{ ansible_operator_meta.name }}-creator-{{ trunc_uuid }}'

‎roles/kernel_cache_drop/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
shell: "python3 /opt/ansible/roles/kernel_cache_drop/wait_for_daemonset.py 30 {{ operator_namespace }} kernel-cache-dropper"
1111

1212
- name: get kernel cache dropper pods
13-
k8s_facts:
13+
k8s_info:
1414
kind: Pod
1515
label_selectors:
1616
- name = kernel-cache-dropper

‎roles/nighthawk/tasks/main.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
- block:
2727

2828
- name: Get server pods
29-
k8s_facts:
29+
k8s_info:
3030
kind: Pod
3131
api_version: v1
3232
namespace: '{{ operator_namespace }}'
@@ -46,7 +46,7 @@
4646
- block:
4747

4848
- name: Get server pod info
49-
k8s_facts:
49+
k8s_info:
5050
kind: Pod
5151
api_version: v1
5252
namespace: '{{ operator_namespace }}'
@@ -55,7 +55,7 @@
5555
register: server_pods
5656

5757
- name: Get route info
58-
k8s_facts:
58+
k8s_info:
5959
kind: Route
6060
api_version: route.openshift.io/v1
6161
namespace: '{{ operator_namespace }}'
@@ -86,7 +86,7 @@
8686

8787
- block:
8888
- name: Get client pod status
89-
k8s_facts:
89+
k8s_info:
9090
kind: Pod
9191
api_version: v1
9292
namespace: '{{ operator_namespace }}'
@@ -129,7 +129,7 @@
129129
- block:
130130
- block:
131131
- name: Waiting for pods to complete....
132-
k8s_facts:
132+
k8s_info:
133133
kind: pod
134134
api_version: v1
135135
namespace: '{{ operator_namespace }}'
@@ -157,7 +157,7 @@
157157

158158
- block:
159159
- name: Get Server Jobs
160-
k8s_facts:
160+
k8s_info:
161161
kind: Job
162162
api_version: v1
163163
namespace: '{{ operator_namespace }}'
@@ -166,7 +166,7 @@
166166
register: server_jobs
167167

168168
- name: Get Server Pods
169-
k8s_facts:
169+
k8s_info:
170170
kind: Pod
171171
api_version: v1
172172
namespace: '{{ operator_namespace }}'

‎roles/pgbench/tasks/run_workload.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
command: "redis-cli set pgb_start true"
44

55
- name: Check for pods to complete
6-
k8s_facts:
6+
k8s_info:
77
kind: pod
88
api_version: v1
99
namespace: '{{ operator_namespace }}'

‎roles/testpmd/tasks/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
- block:
3737

3838
- name: Wait for pods to be running....
39-
k8s_facts:
39+
k8s_info:
4040
kind: Pod
4141
api_version: v1
4242
namespace: '{{ operator_namespace }}'
@@ -65,7 +65,7 @@
6565

6666
- block:
6767
- name: Get TestPMD pod info
68-
k8s_facts:
68+
k8s_info:
6969
kind: Pod
7070
api_version: v1
7171
namespace: '{{ operator_namespace }}'
@@ -89,7 +89,7 @@
8989
- block:
9090

9191
- name: Wait for pods to be running....
92-
k8s_facts:
92+
k8s_info:
9393
kind: Pod
9494
api_version: v1
9595
namespace: '{{ operator_namespace }}'

‎roles/uperf-scale/tasks/cleanup.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
### <POD> kind
55
# Cleanup servers, but leave clients around mostly for further examining of results.
66
- name: Get Server Jobs
7-
k8s_facts:
7+
k8s_info:
88
kind: Job
99
api_version: v1
1010
namespace: '{{ operator_namespace }}'
@@ -13,7 +13,7 @@
1313
register: server_jobs
1414

1515
- name: Get Server Pods
16-
k8s_facts:
16+
k8s_info:
1717
kind: Pod
1818
api_version: v1
1919
namespace: '{{ operator_namespace }}'

‎roles/uperf-scale/tasks/setup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
num_server_pods: "{{ (node_hi_idx|int+1) * (pod_hi_idx|int+1) }}"
7070

7171
- name: Capture ServiceIP
72-
k8s_facts:
72+
k8s_info:
7373
kind: Service
7474
api_version: v1
7575
namespace: '{{ operator_namespace }}'

‎roles/uperf-scale/tasks/start_client.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
- name: Get pod info
4-
k8s_facts:
4+
k8s_info:
55
kind: Pod
66
api_version: v1
77
namespace: '{{ operator_namespace }}'

‎roles/uperf-scale/tasks/start_server.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# to derive its affinity according the 'colocate' variable
4040
#
4141
- name: Wait for pods to be running....
42-
k8s_facts:
42+
k8s_info:
4343
kind: Pod
4444
api_version: v1
4545
namespace: '{{ operator_namespace }}'

‎roles/uperf-scale/tasks/wait_client_done.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
- block:
33
### <POD> kind
44
- name: Waiting for pods to complete....
5-
k8s_facts:
5+
k8s_info:
66
kind: pod
77
api_version: v1
88
namespace: '{{ operator_namespace }}'

‎roles/uperf-scale/tasks/wait_client_ready.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
### <POD> kind
55

66
- name: Get client pod status
7-
k8s_facts:
7+
k8s_info:
88
kind: Pod
99
api_version: v1
1010
namespace: '{{ operator_namespace }}'

‎roles/uperf-scale/tasks/wait_server_ready.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
### <POD> kind
44

55
- name: Get server pods
6-
k8s_facts:
6+
k8s_info:
77
kind: Pod
88
api_version: v1
99
namespace: '{{ operator_namespace }}'

‎roles/uperf/tasks/main.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
- name: Capture ServiceIP
4-
k8s_facts:
4+
k8s_info:
55
kind: Service
66
api_version: v1
77
namespace: '{{ operator_namespace }}'
@@ -62,7 +62,7 @@
6262
- block:
6363

6464
- name: Get server pods
65-
k8s_facts:
65+
k8s_info:
6666
kind: Pod
6767
api_version: v1
6868
namespace: '{{ operator_namespace }}'
@@ -83,7 +83,7 @@
8383
- block:
8484

8585
- name: Wait for vms to be running....
86-
k8s_facts:
86+
k8s_info:
8787
kind: VirtualMachineInstance
8888
api_version: kubevirt.io/v1alpha3
8989
namespace: '{{ operator_namespace }}'
@@ -108,7 +108,7 @@
108108
- block:
109109

110110
- name: Get pod info
111-
k8s_facts:
111+
k8s_info:
112112
kind: Pod
113113
api_version: v1
114114
namespace: '{{ operator_namespace }}'
@@ -153,7 +153,7 @@
153153
- block:
154154

155155
- name: Wait for vms to be running....
156-
k8s_facts:
156+
k8s_info:
157157
kind: VirtualMachineInstance
158158
api_version: kubevirt.io/v1alpha3
159159
namespace: '{{ operator_namespace }}'
@@ -187,7 +187,7 @@
187187

188188
- block:
189189
- name: Get client pod status
190-
k8s_facts:
190+
k8s_info:
191191
kind: Pod
192192
api_version: v1
193193
namespace: '{{ operator_namespace }}'
@@ -218,7 +218,7 @@
218218
command: "redis-cli set complete-{{ trunc_uuid }} false"
219219

220220
- name: Get client vm status
221-
k8s_facts:
221+
k8s_info:
222222
kind: VirtualMachineInstance
223223
api_version: kubevirt.io/v1alpha3
224224
namespace: '{{ operator_namespace }}'
@@ -253,7 +253,7 @@
253253
- block:
254254
- block:
255255
- name: Waiting for pods to complete....
256-
k8s_facts:
256+
k8s_info:
257257
kind: pod
258258
api_version: v1
259259
namespace: '{{ operator_namespace }}'
@@ -295,7 +295,7 @@
295295

296296
- block:
297297
- name: Get Server Jobs
298-
k8s_facts:
298+
k8s_info:
299299
kind: Job
300300
api_version: v1
301301
namespace: '{{ operator_namespace }}'
@@ -304,7 +304,7 @@
304304
register: server_jobs
305305

306306
- name: Get Server Pods
307-
k8s_facts:
307+
k8s_info:
308308
kind: Pod
309309
api_version: v1
310310
namespace: '{{ operator_namespace }}'

‎roles/ycsb/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
ycsb_workload_load: "workloada"
3838

3939
- name: Wait for Load Job to Succeed...
40-
k8s_facts:
40+
k8s_info:
4141
kind: Job
4242
api_version: batch/v1
4343
name: 'ycsb-data-load-job-{{ ycsb_workload_load }}-{{ trunc_uuid }}'
@@ -108,7 +108,7 @@
108108
ycsb_workload: "{{ workload_args.workloads[wrkload.stdout|int] }}"
109109

110110
- name: Wait for YCSB Workload Job to Succeed...
111-
k8s_facts:
111+
k8s_info:
112112
kind: Job
113113
api_version: batch/v1
114114
name: 'ycsb-bench-job-{{ ycsb_workload }}-{{ trunc_uuid }}'

0 commit comments

Comments
 (0)