From 0bf9286e2c0e6c1591616729aa5b35386471efd3 Mon Sep 17 00:00:00 2001 From: crozzy Date: Tue, 9 Apr 2024 14:07:42 -0700 Subject: [PATCH 1/2] chore: update production manifest with new tmp dir Since https://github.com/quay/clair/pull/2019 clair will now use /var/tmp instead of /tmp by default to store the manifest layers. This PR updates where the PVC is mounted in order to concide with the new default. Signed-off-by: crozzy --- contrib/openshift/manifests/manifests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/openshift/manifests/manifests.yaml b/contrib/openshift/manifests/manifests.yaml index 2d7c0d9a3f..bd0d91dd3f 100644 --- a/contrib/openshift/manifests/manifests.yaml +++ b/contrib/openshift/manifests/manifests.yaml @@ -56,7 +56,7 @@ objects: command: - sh - '-c' - - rm -rf /tmp/sha* /tmp/fetch.* /tmp/rpmscanner.* && exec clair + - rm -rf /var/tmp/sha* /var/tmp/fetch.* /var/tmp/rpmscanner.* && exec clair env: - name: CLAIR_CONF value: '/etc/clair/config.yaml' @@ -86,7 +86,7 @@ objects: - name: clair-config mountPath: /etc/clair - name: indexer-layer-storage - mountPath: /tmp + mountPath: /var/tmp # # matcher deployment From f19b59bd3efad37aa199c62c5bc5e5914d8d4143 Mon Sep 17 00:00:00 2001 From: crozzy Date: Tue, 9 Apr 2024 15:00:33 -0700 Subject: [PATCH 2/2] contrib: remove rms that were needed for previous fetcher Since https://github.com/quay/claircore/pull/1061 we should no longer need the pre-removal of fetch layers. Signed-off-by: crozzy --- contrib/openshift/manifests/manifests.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/openshift/manifests/manifests.yaml b/contrib/openshift/manifests/manifests.yaml index bd0d91dd3f..3082f9ab8d 100644 --- a/contrib/openshift/manifests/manifests.yaml +++ b/contrib/openshift/manifests/manifests.yaml @@ -53,10 +53,7 @@ objects: requests: cpu: ${{INDEXER_CPU_REQS}} memory: ${{INDEXER_MEM_REQS}} - command: - - sh - - '-c' - - rm -rf /var/tmp/sha* /var/tmp/fetch.* /var/tmp/rpmscanner.* && exec clair + command: [clair] env: - name: CLAIR_CONF value: '/etc/clair/config.yaml'