Skip to content

Commit 6dfa94c

Browse files
Sheikah45Brutus5000
authored andcommitted
Suppress newlines when parsing with jq
1 parent d8f0aa5 commit 6dfa94c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

scripts/k8s-helpers.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ get_newest_pod_by_app_name() {
5555
}
5656

5757
get_config_value() {
58-
kubectl -n $NAMESPACE get cm "$1" -o json | jq -r ".data.${2}"
58+
kubectl -n $NAMESPACE get cm "$1" -o json | jq -j ".data.${2}"
5959
}
6060

6161
get_secret_value() {
62-
kubectl -n $NAMESPACE get secret "$1" -o json | jq -r ".data.${2}" | base64 -d
62+
kubectl -n $NAMESPACE get secret "$1" -o json | jq -j ".data.${2}" | base64 -d
6363
}
6464

6565
# has_annotation(resourceType [e.g. pod], resourceName [e.g. mongodb], annotationName, annotationValue)
@@ -72,12 +72,12 @@ has_annotation_with_value() {
7272
ANNOTATION_NAME=$3
7373
REQUIRED_VALUE=$4
7474

75-
ACTUAL_VALUE=$(kubectl -n $NAMESPACE get "$RESOURCE_TYPE" "$RESOURCE_NAME" -o json | jq -r ".metadata.annotations.$ANNOTATION_NAME")
75+
ACTUAL_VALUE=$(kubectl -n $NAMESPACE get "$RESOURCE_TYPE" "$RESOURCE_NAME" -o json | jq -j ".metadata.annotations.$ANNOTATION_NAME")
7676

7777
if test "$REQUIRED_VALUE" = "$ACTUAL_VALUE"
7878
then
7979
return 0
8080
else
8181
return 1
8282
fi
83-
}
83+
}

0 commit comments

Comments
 (0)