@@ -633,14 +633,16 @@ commands:
633633 YAMLEOF
634634 )
635635 actual=$(kubectl -n $NAMESPACE get cm druid -o yaml | yq -o=json '.data')
636- if [ "$expected" != "$actual" ]; then
636+ expected_file=$(mktemp) && actual_file=$(mktemp)
637+ printf '%s\n' "$expected" > "$expected_file"
638+ printf '%s\n' "$actual" > "$actual_file"
639+ if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
637640 echo "ERROR: ConfigMap druid data drifted from snapshot."
638- echo "=== expected ==="
639- printf '%s\n' "$expected"
640- echo "=== actual ==="
641- printf '%s\n' "$actual"
641+ printf '%s\n' "$diff_out"
642+ rm -f "$expected_file" "$actual_file"
642643 exit 1
643644 fi
645+ rm -f "$expected_file" "$actual_file"
644646
645647 # Role-group ConfigMap: druid-broker-default
646648 - script: |
@@ -733,14 +735,16 @@ commands:
733735 actual=$(kubectl -n $NAMESPACE get cm druid-broker-default -o yaml \
734736 | yq -o=json '.data' \
735737 | sed -E 's|/znode-[a-f0-9-]+|/znode-__ZNODE__|')
736- if [ "$expected" != "$actual" ]; then
738+ expected_file=$(mktemp) && actual_file=$(mktemp)
739+ printf '%s\n' "$expected" > "$expected_file"
740+ printf '%s\n' "$actual" > "$actual_file"
741+ if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
737742 echo "ERROR: ConfigMap druid-broker-default data drifted from snapshot."
738- echo "=== expected ==="
739- printf '%s\n' "$expected"
740- echo "=== actual ==="
741- printf '%s\n' "$actual"
743+ printf '%s\n' "$diff_out"
744+ rm -f "$expected_file" "$actual_file"
742745 exit 1
743746 fi
747+ rm -f "$expected_file" "$actual_file"
744748
745749 # Role-group ConfigMap: druid-coordinator-default
746750 - script: |
@@ -839,14 +843,16 @@ commands:
839843 actual=$(kubectl -n $NAMESPACE get cm druid-coordinator-default -o yaml \
840844 | yq -o=json '.data' \
841845 | sed -E 's|/znode-[a-f0-9-]+|/znode-__ZNODE__|')
842- if [ "$expected" != "$actual" ]; then
846+ expected_file=$(mktemp) && actual_file=$(mktemp)
847+ printf '%s\n' "$expected" > "$expected_file"
848+ printf '%s\n' "$actual" > "$actual_file"
849+ if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
843850 echo "ERROR: ConfigMap druid-coordinator-default data drifted from snapshot."
844- echo "=== expected ==="
845- printf '%s\n' "$expected"
846- echo "=== actual ==="
847- printf '%s\n' "$actual"
851+ printf '%s\n' "$diff_out"
852+ rm -f "$expected_file" "$actual_file"
848853 exit 1
849854 fi
855+ rm -f "$expected_file" "$actual_file"
850856
851857 # Role-group ConfigMap: druid-historical-default
852858 - script: |
@@ -945,14 +951,16 @@ commands:
945951 actual=$(kubectl -n $NAMESPACE get cm druid-historical-default -o yaml \
946952 | yq -o=json '.data' \
947953 | sed -E 's|/znode-[a-f0-9-]+|/znode-__ZNODE__|')
948- if [ "$expected" != "$actual" ]; then
954+ expected_file=$(mktemp) && actual_file=$(mktemp)
955+ printf '%s\n' "$expected" > "$expected_file"
956+ printf '%s\n' "$actual" > "$actual_file"
957+ if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
949958 echo "ERROR: ConfigMap druid-historical-default data drifted from snapshot."
950- echo "=== expected ==="
951- printf '%s\n' "$expected"
952- echo "=== actual ==="
953- printf '%s\n' "$actual"
959+ printf '%s\n' "$diff_out"
960+ rm -f "$expected_file" "$actual_file"
954961 exit 1
955962 fi
963+ rm -f "$expected_file" "$actual_file"
956964
957965 # Role-group ConfigMap: druid-middlemanager-default
958966 - script: |
@@ -1048,14 +1056,16 @@ commands:
10481056 actual=$(kubectl -n $NAMESPACE get cm druid-middlemanager-default -o yaml \
10491057 | yq -o=json '.data' \
10501058 | sed -E 's|/znode-[a-f0-9-]+|/znode-__ZNODE__|')
1051- if [ "$expected" != "$actual" ]; then
1059+ expected_file=$(mktemp) && actual_file=$(mktemp)
1060+ printf '%s\n' "$expected" > "$expected_file"
1061+ printf '%s\n' "$actual" > "$actual_file"
1062+ if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
10521063 echo "ERROR: ConfigMap druid-middlemanager-default data drifted from snapshot."
1053- echo "=== expected ==="
1054- printf '%s\n' "$expected"
1055- echo "=== actual ==="
1056- printf '%s\n' "$actual"
1064+ printf '%s\n' "$diff_out"
1065+ rm -f "$expected_file" "$actual_file"
10571066 exit 1
10581067 fi
1068+ rm -f "$expected_file" "$actual_file"
10591069
10601070 # Role-group ConfigMap: druid-router-default
10611071 - script: |
@@ -1149,11 +1159,13 @@ commands:
11491159 actual=$(kubectl -n $NAMESPACE get cm druid-router-default -o yaml \
11501160 | yq -o=json '.data' \
11511161 | sed -E 's|/znode-[a-f0-9-]+|/znode-__ZNODE__|')
1152- if [ "$expected" != "$actual" ]; then
1162+ expected_file=$(mktemp) && actual_file=$(mktemp)
1163+ printf '%s\n' "$expected" > "$expected_file"
1164+ printf '%s\n' "$actual" > "$actual_file"
1165+ if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
11531166 echo "ERROR: ConfigMap druid-router-default data drifted from snapshot."
1154- echo "=== expected ==="
1155- printf '%s\n' "$expected"
1156- echo "=== actual ==="
1157- printf '%s\n' "$actual"
1167+ printf '%s\n' "$diff_out"
1168+ rm -f "$expected_file" "$actual_file"
11581169 exit 1
11591170 fi
1171+ rm -f "$expected_file" "$actual_file"
0 commit comments