From ae20e5558586c5594c6e6669702adc26cd0dd5bf Mon Sep 17 00:00:00 2001 From: Martin Sivak Date: Mon, 4 Sep 2023 12:25:26 +0200 Subject: [PATCH] Use oc get daemonset to identify the NTO image The previous method of using oc adm release info has been problematic for CI and restricted network environment clusters. The issue was always the authentication to the registry and access to the release image from the inside of must-gather. Also the oc adm release info tool runs inside a container and does not respect the node level ImageContentSourcePolicy. For all these reasons I want to retrieve the image name from the configured NTO deployment instead. Signed-off-by: Martin Sivak --- collection-scripts/gather_ppc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collection-scripts/gather_ppc b/collection-scripts/gather_ppc index f8f232b6..02565b77 100755 --- a/collection-scripts/gather_ppc +++ b/collection-scripts/gather_ppc @@ -39,7 +39,7 @@ function ppc_nodes() { # Find the NTO image reference # NTO contains all the tools needed here - NTO=$(oc adm release info --image-for=cluster-node-tuning-operator) + NTO=$(oc get deployment -n openshift-cluster-node-tuning-operator cluster-node-tuning-operator -o jsonpath="{.spec.template.spec.containers[0].image}") if [ $? -ne 0 ]; then echo "ERROR: Failed to identify the container image with node tools." echo "INFO: Node performance data collection will not contain node level data."