Skip to content

Commit 2c7a24f

Browse files
committed
ai suggested fixes
1 parent ae8951e commit 2c7a24f

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

operators/openshift-pipelines-operator-rh/clair_import_pipeline.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,20 @@
4040
image: "{{ oc_cli_image }}"
4141
script: |
4242
#!/bin/bash
43+
set -uo pipefail
4344
4445
clair_pod_name=$(oc get pods -n quay-enterprise -l quay-component=clair-app -o name | cut -d/ -f2)
45-
oc exec -n quay-enterprise $clair_pod_name -- \
46+
if oc exec -n quay-enterprise "$clair_pod_name" -- \
4647
/bin/sh -c "
4748
curl -L -o /tmp/updates.json.gz http://{{ quayHostname }}/clair/updates.json.gz
4849
/usr/bin/clairctl --config /clair/config.yaml import-updaters /tmp/updates.json.gz
49-
" > $(results.status-report.path)
50-
echo $? > $(results.exit-code.path)
50+
" > "$(results.status-report.path)" 2>&1; then
51+
rc=0
52+
else
53+
rc=$?
54+
fi
55+
echo "$rc" > "$(results.exit-code.path)"
56+
exit "$rc"
5157
5258
- name: Create Clair Import Pipeline
5359
kubernetes.core.k8s:
@@ -63,9 +69,9 @@
6369
- name: clair-import
6470
taskRef:
6571
name: clair-import
66-
results:
67-
- name: exit-code
68-
value: $(tasks.clair-import.results.exit-code)
69-
- name: status-report
70-
value: $(tasks.clair-import.results.status-report)
72+
results:
73+
- name: exit-code
74+
value: $(tasks.clair-import.results.exit-code)
75+
- name: status-report
76+
value: $(tasks.clair-import.results.status-report)
7177
timeout: "1h"

operators/quay-operator/clair_disconnected.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@
4949
rules:
5050
- apiGroups: [""]
5151
resources: ["pods"]
52-
verbs: ["get", "list", "exec"]
52+
verbs: ["get", "list"]
53+
- apiGroups: [""]
54+
resources: ["pods/exec"]
55+
verbs: ["create"]
5356

5457
- name: Create Clair Import RoleBinding
5558
kubernetes.core.k8s:

0 commit comments

Comments
 (0)