Skip to content

Commit 03db091

Browse files
committed
Merge branch 'fix-jq-large-model-wotemplate' into 'release/4.2'
fix jq error for model without server template See merge request weblogic-cloud/weblogic-kubernetes-operator!4763
2 parents 97374fd + 1de7a2b commit 03db091

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

operator/src/main/resources/scripts/modelInImage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ diff_model() {
633633
# Get partial models for sanity check for forbidden attribute change
634634
local SERVER_OR_SERVERTEMPLATES_NAMES
635635
SERVER_OR_SERVERTEMPLATES_NAMES=$(jq '{ topology: { Server: (.topology.Server | with_entries(.value = {})),
636-
ServerTemplate: (if .topology.ServerTemplate then (.topology.ServerTemplate | with_entries(.value = {})) else empty end)
636+
ServerTemplate: (if .topology.ServerTemplate then (.topology.ServerTemplate | with_entries(.value = {})) else {} end)
637637
}} | if .topology.ServerTemplate == {} then del(.topology.ServerTemplate) else . end' $2)
638638
rc=$?
639639
if [ $rc -ne 0 ] ; then

0 commit comments

Comments
 (0)