Do not redefine the global $resources variable #23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fmount
force-pushed
the
fix_crs
branch
3 times, most recently
from
9e03265 to
ed2249d
Compare
fmount
changed the title
fmount
changed the title
Akrog
requested changes
Nov 27, 2023
collection-scripts/gather_crds
Outdated
| for resource in "${resources[@]}"; do | ||
| run_bg /usr/bin/oc adm inspect --dest-dir must-gather "${resource}" | ||
| for resource in "${crds[@]}"; do | ||
| run_bg /usr/bin/oc get crd "$resource" > "${BASE_COLLECTION_PATH}/crd/${resource}.yaml" |
There was a problem hiding this comment.
-1: I don't think this is not going to output the yaml like we want should be oc get crd "$resource" -o yaml
There was a problem hiding this comment.
Makes sense, updating it!
collection-scripts/gather_crs
Outdated
| while read -r ocresource; do | ||
| ocobject=$(echo "$ocresource" | awk '{print $1}') | ||
| ocproject=$(echo "$ocresource" | awk '{print $2}') | ||
| if [ -z "${ocproject}" ]||[ "${ocproject}" == "<none>" ]; then | ||
| object_collection_path=${BASE_COLLECTION_PATH}/cluster-scoped-resources/${resource} | ||
| if [ -n "${ocproject}" ]||[ "${ocproject}" != "<none>" ]; then |
There was a problem hiding this comment.
-1: This should not be an or (||) but an and (&&)
There was a problem hiding this comment.
right, not sure why I have this leftover here, but yes, when I change -z to -n I intended to change the and condition as well! Updating it!
This patch fixes in the first place the usage of the "resources" variable. The purpose of this variable is to define a set of k8s related services that should be collected for each namespace; for this reason it's defined in common.sh and exported, so it can be used in any script that is sourced by "gather_run". Instead of using the same "$resources" variable that is used a lot in the collection-scripts, this change customizes the variable name used to collect CR(s) and apiservices, and it avoids collisions with other 'get_resources' happening in other namespaces. In addition, this patch fixes the way CRD(s) are collected: they are global and shouldn't be collected "per namespace", hence they're now collected within the "crd/" folder created in the root must-gather directory. Signed-off-by: Francesco Pantano <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch fixes in the first place the usage of the
resourcesvariable.The purpose of this variable is to define a set of
k8srelated servicesthat should be collected for each
namespace; for this reason it'sdefined in
common.shand exported, so it can be used in any scriptthat is sourced by
gather_run.Instead of using the same
$resourcesvariable that is used a lot in thecollection-scripts, this change customizes the variable name used to collect
CR(s)andapiservices, and it avoids collisions with otherget_resourceshappening in other
namespaces.In addition, this patch fixes the way
CRD(s)are collected: they are globaland shouldn't be collected
per-namespace, hence they're now collectedwithin the
crd/folder created in the rootmust-gatherdirectory.