Merge pull request #323 from masap/sr-release-v0.79.2

Updating supportability-review collection scripts (v0.79.2)
rancherlabs · Nov 20, 2024 · 0872cbe · 0872cbe
2 parents 26b870f + 61a6f43
commit 0872cbe
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/collection/rancher/v2.x/supportability-review/collect.sh b/collection/rancher/v2.x/supportability-review/collect.sh
@@ -97,6 +97,17 @@ else
 
   CONTAINER_RUNTIME_ARGS="$CONTAINER_RUNTIME_ARGS -v ${KUBECONFIG}:/tmp/kubeconfig.yml"
   COLLECT_INFO_FROM_RANCHER_SETUP_ARGS="$COLLECT_INFO_FROM_RANCHER_SETUP_ARGS --kubeconfig /tmp/kubeconfig.yml"
+
+  if [ -d "$HOME/.aws" ]; then
+    CONTAINER_RUNTIME_ARGS="$CONTAINER_RUNTIME_ARGS -v $HOME/.aws:/root/.aws"
+  fi
+  if [[ -v "AWS_ACCESS_KEY_ID" && -v "AWS_SECRET_ACCESS_KEY" ]]; then
+    CONTAINER_RUNTIME_ARGS="$CONTAINER_RUNTIME_ARGS -e AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}" -e AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}""
+    if [[ -v AWS_SESSION_TOKEN ]]; then
+      CONTAINER_RUNTIME_ARGS="$CONTAINER_RUNTIME_ARGS -e AWS_SESSION_TOKEN="${AWS_SESSION_TOKEN}""
+    fi
+  fi
+
 fi
 
 CONTAINER_RUNTIME_ARGS="$CONTAINER_RUNTIME_ARGS -e S3_ENDPOINT_URL="${S3_ENDPOINT_URL}""