Merge "Fix cluster chart for single-node cluster"